mirror of
https://github.com/UpsilonNumworks/Upsilon.git
synced 2026-01-19 00:37:25 +01:00
Add a diagnostic too to navigate structure layouts
Change-Id: I236e6ac8aa51295be9c3d157eb49710977f083f8
This commit is contained in:
Romain Goyet
1
Makefile
1
Makefile
@@ -76,6 +76,7 @@ include poincare/Makefile
|
||||
include escher/Makefile
|
||||
# Executable Makefiles
|
||||
include apps/Makefile
|
||||
include build/struct_layout/Makefile
|
||||
include quiz/Makefile # Quiz needs to be included at the end
|
||||
|
||||
products += $(objs)
|
||||
|
||||
8
build/struct_layout/Makefile
Normal file
8
build/struct_layout/Makefile
Normal file
@@ -0,0 +1,8 @@
|
||||
products += build/struct_layout/apps_container_layout.json
|
||||
build/struct_layout/apps_container_layout.json:
|
||||
@echo "AST $@"
|
||||
@clang -cc1 -x c++ -v -fdump-record-layouts apps/main.cpp -Iescher/include -Ikandinsky/include -Iion/include -Ipoincare/include -std=c++11 -emit-llvm-only -o /dev/null > foo.txt
|
||||
@echo "JSON $@"
|
||||
@cat foo.txt | ruby build/struct_layout/ast_to_json.rb AppsContainer > $@
|
||||
@rm foo.txt
|
||||
|
||||
83
build/struct_layout/ast_to_json.rb
Normal file
83
build/struct_layout/ast_to_json.rb
Normal file
@@ -0,0 +1,83 @@
|
||||
#!/usr/bin/env ruby
|
||||
|
||||
# Takes an clang-generated AST in stdin
|
||||
# Outputs a D3-compliant JSON file
|
||||
|
||||
require 'json'
|
||||
|
||||
class CodeStruct
|
||||
attr_accessor :name, :starts_at, :size
|
||||
|
||||
def initialize(parent, name, starts_at)
|
||||
@parent = parent
|
||||
@name = name
|
||||
@starts_at = starts_at
|
||||
@size = 0
|
||||
@children = []
|
||||
@parent.add_child(self) unless @parent.nil?
|
||||
end
|
||||
|
||||
def ends_at(offset)
|
||||
@size = offset-@starts_at
|
||||
end
|
||||
|
||||
def add_child(s)
|
||||
@children.push(s)
|
||||
end
|
||||
|
||||
def as_d3_dict
|
||||
res = {name: name}
|
||||
if @children.empty?
|
||||
res[:value] = size
|
||||
else
|
||||
res[:children] = @children.map{|c| c.as_d3_dict}
|
||||
end
|
||||
res
|
||||
end
|
||||
|
||||
def log(space = 0)
|
||||
puts (" "*space) + "#{name} (SIZE=#{size})"
|
||||
@children.each do |child|
|
||||
child.log(space+2)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def handleNewLine(line, index, stack)
|
||||
# Example : " 213736 | class Timer (primary base)"
|
||||
offset, depth, name = line.match(/\s*([0-9]+)\s\|(\s+)(.*)/).captures
|
||||
offset = offset.to_i
|
||||
depth = (depth.size-1)/2
|
||||
|
||||
parent = stack[depth-1]
|
||||
stack[depth..-1].each do |finished|
|
||||
finished.ends_at(offset)
|
||||
end
|
||||
stack = stack[0...depth]
|
||||
struct = CodeStruct.new(parent, name, offset)
|
||||
stack.push(struct)
|
||||
|
||||
return stack
|
||||
end
|
||||
|
||||
class_name = ARGV[0]
|
||||
|
||||
stack = []
|
||||
ignore_line = true
|
||||
STDIN.each_line.with_index do |l,i|
|
||||
if l == " 0 | class #{class_name}\n"
|
||||
ignore_line = false
|
||||
end
|
||||
if l.start_with?(" | ") && ignore_line == false
|
||||
ignore_line = true
|
||||
end_offset = l.match(/sizeof=([0-9]+)/).captures.first
|
||||
end_offset = end_offset.to_i
|
||||
stack[-1].ends_at(end_offset)
|
||||
stack[0].ends_at(end_offset)
|
||||
end
|
||||
unless ignore_line
|
||||
stack = handleNewLine(l, i, stack)
|
||||
end
|
||||
end
|
||||
|
||||
puts JSON.generate(stack[0].as_d3_dict)
|
||||
243
build/struct_layout/visualisation.html
Normal file
243
build/struct_layout/visualisation.html
Normal file
@@ -0,0 +1,243 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<meta charset="utf-8">
|
||||
<title>AppsContainer size breakdown</title>
|
||||
<style>
|
||||
svg {
|
||||
font: 10px sans-serif;
|
||||
}
|
||||
|
||||
#chart {
|
||||
width: 960px;
|
||||
height: 500px;
|
||||
background: #ddd;
|
||||
}
|
||||
|
||||
text {
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.grandparent text {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
rect {
|
||||
fill: none;
|
||||
stroke: #fff;
|
||||
}
|
||||
|
||||
rect.parent,
|
||||
.grandparent rect {
|
||||
stroke-width: 2px;
|
||||
}
|
||||
|
||||
.grandparent rect {
|
||||
fill: #FFB734;
|
||||
}
|
||||
|
||||
.grandparent:hover rect {
|
||||
fill: #edaa30;
|
||||
}
|
||||
|
||||
.children rect.parent,
|
||||
.grandparent rect {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.children rect.parent {
|
||||
fill: #bbb;
|
||||
fill-opacity: .5;
|
||||
}
|
||||
|
||||
.children:hover rect.child {
|
||||
fill: #bbb;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<h1>AppsContainer size breakdown</h1>
|
||||
|
||||
<p id="chart">
|
||||
|
||||
<script src="https://d3js.org/d3.v3.min.js" charset="utf-8"></script></script>
|
||||
<script>
|
||||
|
||||
var margin = {top: 20, right: 0, bottom: 0, left: 0},
|
||||
width = 960,
|
||||
height = 500 - margin.top - margin.bottom,
|
||||
formatNumber = d3.format(".2s"),
|
||||
transitioning;
|
||||
|
||||
var x = d3.scale.linear()
|
||||
.domain([0, width])
|
||||
.range([0, width]);
|
||||
|
||||
var y = d3.scale.linear()
|
||||
.domain([0, height])
|
||||
.range([0, height]);
|
||||
|
||||
var treemap = d3.layout.treemap()
|
||||
.children(function(d, depth) { return depth ? null : d._children; })
|
||||
.sort(function(a, b) { return a.value - b.value; })
|
||||
.ratio(height / width * 0.5 * (1 + Math.sqrt(5)))
|
||||
.round(false);
|
||||
|
||||
var svg = d3.select("#chart").append("svg")
|
||||
.attr("width", width + margin.left + margin.right)
|
||||
.attr("height", height + margin.bottom + margin.top)
|
||||
.style("margin-left", -margin.left + "px")
|
||||
.style("margin.right", -margin.right + "px")
|
||||
.append("g")
|
||||
.attr("transform", "translate(" + margin.left + "," + margin.top + ")")
|
||||
.style("shape-rendering", "crispEdges");
|
||||
|
||||
var grandparent = svg.append("g")
|
||||
.attr("class", "grandparent");
|
||||
|
||||
grandparent.append("rect")
|
||||
.attr("y", -margin.top)
|
||||
.attr("width", width)
|
||||
.attr("height", margin.top);
|
||||
|
||||
grandparent.append("text")
|
||||
.attr("x", 6)
|
||||
.attr("y", 6 - margin.top)
|
||||
.attr("dy", ".75em");
|
||||
|
||||
d3.json("apps_container_layout.json", function(root) {
|
||||
initialize(root);
|
||||
accumulate(root);
|
||||
layout(root);
|
||||
display(root);
|
||||
|
||||
function initialize(root) {
|
||||
root.x = root.y = 0;
|
||||
root.dx = width;
|
||||
root.dy = height;
|
||||
root.depth = 0;
|
||||
}
|
||||
|
||||
// Aggregate the values for internal nodes. This is normally done by the
|
||||
// treemap layout, but not here because of our custom implementation.
|
||||
// We also take a snapshot of the original children (_children) to avoid
|
||||
// the children being overwritten when when layout is computed.
|
||||
function accumulate(d) {
|
||||
return (d._children = d.children)
|
||||
? d.value = d.children.reduce(function(p, v) { return p + accumulate(v); }, 0)
|
||||
: d.value;
|
||||
}
|
||||
|
||||
// Compute the treemap layout recursively such that each group of siblings
|
||||
// uses the same size (1×1) rather than the dimensions of the parent cell.
|
||||
// This optimizes the layout for the current zoom state. Note that a wrapper
|
||||
// object is created for the parent node for each group of siblings so that
|
||||
// the parent’s dimensions are not discarded as we recurse. Since each group
|
||||
// of sibling was laid out in 1×1, we must rescale to fit using absolute
|
||||
// coordinates. This lets us use a viewport to zoom.
|
||||
function layout(d) {
|
||||
if (d._children) {
|
||||
treemap.nodes({_children: d._children});
|
||||
d._children.forEach(function(c) {
|
||||
c.x = d.x + c.x * d.dx;
|
||||
c.y = d.y + c.y * d.dy;
|
||||
c.dx *= d.dx;
|
||||
c.dy *= d.dy;
|
||||
c.parent = d;
|
||||
layout(c);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function display(d) {
|
||||
grandparent
|
||||
.datum(d.parent)
|
||||
.on("click", transition)
|
||||
.select("text")
|
||||
.text(name(d));
|
||||
|
||||
var g1 = svg.insert("g", ".grandparent")
|
||||
.datum(d)
|
||||
.attr("class", "depth");
|
||||
|
||||
var g = g1.selectAll("g")
|
||||
.data(d._children)
|
||||
.enter().append("g");
|
||||
|
||||
g.filter(function(d) { return d._children; })
|
||||
.classed("children", true)
|
||||
.on("click", transition);
|
||||
|
||||
g.selectAll(".child")
|
||||
.data(function(d) { return d._children || [d]; })
|
||||
.enter().append("rect")
|
||||
.attr("class", "child")
|
||||
.call(rect);
|
||||
|
||||
g.append("rect")
|
||||
.attr("class", "parent")
|
||||
.call(rect)
|
||||
.append("title")
|
||||
.text(function(d) { return formatNumber(d.value); });
|
||||
|
||||
g.append("text")
|
||||
.attr("dy", ".75em")
|
||||
.text(function(d) { return d.name; })
|
||||
.call(text);
|
||||
|
||||
function transition(d) {
|
||||
if (transitioning || !d) return;
|
||||
transitioning = true;
|
||||
|
||||
var g2 = display(d),
|
||||
t1 = g1.transition().duration(750),
|
||||
t2 = g2.transition().duration(750);
|
||||
|
||||
// Update the domain only after entering new elements.
|
||||
x.domain([d.x, d.x + d.dx]);
|
||||
y.domain([d.y, d.y + d.dy]);
|
||||
|
||||
// Enable anti-aliasing during the transition.
|
||||
svg.style("shape-rendering", null);
|
||||
|
||||
// Draw child nodes on top of parent nodes.
|
||||
svg.selectAll(".depth").sort(function(a, b) { return a.depth - b.depth; });
|
||||
|
||||
// Fade-in entering text.
|
||||
g2.selectAll("text").style("fill-opacity", 0);
|
||||
|
||||
// Transition to the new view.
|
||||
t1.selectAll("text").call(text).style("fill-opacity", 0);
|
||||
t2.selectAll("text").call(text).style("fill-opacity", 1);
|
||||
t1.selectAll("rect").call(rect);
|
||||
t2.selectAll("rect").call(rect);
|
||||
|
||||
// Remove the old node when the transition is finished.
|
||||
t1.remove().each("end", function() {
|
||||
svg.style("shape-rendering", "crispEdges");
|
||||
transitioning = false;
|
||||
});
|
||||
}
|
||||
|
||||
return g;
|
||||
}
|
||||
|
||||
function text(text) {
|
||||
text.attr("x", function(d) { return x(d.x) + 6; })
|
||||
.attr("y", function(d) { return y(d.y) + 6; });
|
||||
}
|
||||
|
||||
function rect(rect) {
|
||||
rect.attr("x", function(d) { return x(d.x); })
|
||||
.attr("y", function(d) { return y(d.y); })
|
||||
.attr("width", function(d) { return x(d.x + d.dx) - x(d.x); })
|
||||
.attr("height", function(d) { return y(d.y + d.dy) - y(d.y); });
|
||||
}
|
||||
|
||||
function name(d) {
|
||||
return d.parent
|
||||
? name(d.parent) + " / " + d.name
|
||||
: d.name;
|
||||
}
|
||||
});
|
||||
|
||||
</script>
|
||||
Reference in New Issue
Block a user