From 2f75ffac1f8b255335987d25831bbc6f51406d85 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 7 Oct 2021 10:43:46 -0400 Subject: hadrian/doc: Add margin to staged-compilation figure --- hadrian/doc/staged-compilation.svg | 380 ++++++++++++++++++++----------------- 1 file changed, 203 insertions(+), 177 deletions(-) diff --git a/hadrian/doc/staged-compilation.svg b/hadrian/doc/staged-compilation.svg index 02247d04e1..f80094facc 100644 --- a/hadrian/doc/staged-compilation.svg +++ b/hadrian/doc/staged-compilation.svg @@ -2,20 +2,22 @@ + inkscape:version="1.1 (c68e22c387, 2021-05-23)" + sodipodi:docname="staged-compilation.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + Staged Compilation in Hadrian @@ -46,7 +48,7 @@ inkscape:connector-curvature="0" id="path4017" d="M 0,0 5,-5 -12.5,0 5,5 Z" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" transform="matrix(-0.8,0,0,-0.8,-10,0)" /> @@ -76,7 +78,7 @@ inkscape:connector-curvature="0" id="path1595" d="M 0,0 5,-5 -12.5,0 5,5 Z" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" transform="matrix(-0.8,0,0,-0.8,-10,0)" /> @@ -105,7 +107,7 @@ @@ -119,7 +121,7 @@ inkscape:stockid="Arrow1Lend"> @@ -136,7 +138,7 @@ @@ -151,7 +153,7 @@ @@ -166,7 +168,7 @@ inkscape:collect="always"> @@ -182,7 +184,7 @@ inkscape:collect="always"> @@ -199,7 +201,7 @@ @@ -214,7 +216,7 @@ inkscape:collect="always"> @@ -231,7 +233,7 @@ @@ -246,7 +248,7 @@ inkscape:collect="always"> @@ -263,7 +265,7 @@ @@ -279,7 +281,7 @@ inkscape:connector-curvature="0" id="path8904-6" d="M 0,0 5,-5 -12.5,0 5,5 Z" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" transform="matrix(-0.8,0,0,-0.8,-10,0)" /> @@ -307,8 +309,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.979899" - inkscape:cx="256.01624" - inkscape:cy="450.23598" + inkscape:cx="194.95944" + inkscape:cy="376.28182" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="true" @@ -324,11 +326,13 @@ inkscape:bbox-nodes="false" inkscape:snap-bbox-edge-midpoints="false" inkscape:snap-object-midpoints="true" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - inkscape:snap-text-baseline="true"> + fit-margin-top="2" + fit-margin-left="2" + fit-margin-right="2" + fit-margin-bottom="2" + inkscape:snap-text-baseline="true" + inkscape:pagecheckerboard="0" + lock-margins="true"> + originx="-2.1274997" + originy="-104.64166" /> @@ -407,15 +411,37 @@ image/svg+xml - + + Staged Compilation in Hadrian + + + Ben Gamari + + + + + + + + + + + transform="translate(-2.1275003,8.142903)"> @@ -426,21 +452,21 @@ height="16" width="20" id="rect4518" - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#cddbec;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.26499999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#cddbec;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.265;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> ghcstage 0 @@ -448,7 +474,7 @@ id="g4548" transform="translate(31.979113)"> ghcghcstage 1 ghcstage 1 @@ -498,21 +524,21 @@ height="16" width="20" id="rect4550" - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#dfe9a0;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.26499999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#dfe9a0;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.265;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> ghcstage 2 @@ -520,10 +546,10 @@ inkscape:connector-curvature="0" id="path4574" d="M 41.010417,33.539062 H 56.427279" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.11666654, 1.05833327;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Lend)" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.11667, 1.05833;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Lend)" sodipodi:nodetypes="cc" /> basebasestage 0 + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#cddbec;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.265;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> integer-*stage 0 + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#dfe9a0;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.265;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> basestage 1 @@ -640,7 +666,7 @@ transform="translate(31.762082,59.344634)" id="g6824"> integer-*stage 1 + y="37.110786" + style="stroke-width:0.264583px">stage 1 @@ -686,13 +712,13 @@ inkscape:connector-curvature="0" id="path8158" d="m 140.22917,41.677083 -27.78125,15.875" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker8162)" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker8162)" sodipodi:nodetypes="cc" /> basebasestage 2 ghcghcstage 3 + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.11667, 1.05833;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker1887)" /> HadrianHadrianpath _build/stage0 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Courier;-inkscape-font-specification:Courier;stroke-width:0.264583px">_build/stage0 _build/stage1 _build/stage2 + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Courier;-inkscape-font-specification:Courier;stroke-width:0.264583px">_build/stage2 @@ -825,7 +851,7 @@ y="60.509537" ry="0.89490014" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#dfe9a0;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.265;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> Produced during GHC build + style="text-align:start;text-anchor:start;stroke-width:0.264583px">Produced during GHC build Optionally produced during GHC build "x produces y" + style="text-align:start;text-anchor:start;stroke-width:0.264583px">"x produces y" x + style="stroke-width:0.264583px">x y + style="stroke-width:0.264583px">y + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker8906-4)" /> + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.11667, 1.05833;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker1597)" /> @@ -975,22 +1001,22 @@ height="16" width="20" id="rect3549" - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#dfe9a0;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.26499999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#dfe9a0;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.265;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> hadrian @@ -999,10 +1025,10 @@ inkscape:connector-curvature="0" id="path4015" d="M 67.46875,9.6702716 V 17.864589" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.11666654, 1.05833327;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker4019)" /> + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.11667, 1.05833;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker4019)" /> everything below + style="stroke-width:0.264583px">everything below ghcruns on build + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Courier;-inkscape-font-specification:Courier;stroke-width:0.264583px">build build target + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Courier;-inkscape-font-specification:Courier;stroke-width:0.264583px">target target producesproducescode for build target + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Courier;-inkscape-font-specification:Courier;stroke-width:0.264583px">target target target + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Courier;-inkscape-font-specification:Courier;stroke-width:0.264583px">target -- cgit v1.2.1