From 65517ee8a1a422017e01aba123dbbafd9a0c7a7b Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Tue, 22 Mar 2022 09:31:48 +0000 Subject: Update data and add css --- css/main.css | 61 +++++++++++++ notes/5c6faa9f-2ae4-4dda-83a6-00f283ce2ea3.org | 122 ++++++++++++------------- publish.el | 48 ++-------- 3 files changed, 129 insertions(+), 102 deletions(-) create mode 100644 css/main.css diff --git a/css/main.css b/css/main.css new file mode 100644 index 0000000..d77a4c4 --- /dev/null +++ b/css/main.css @@ -0,0 +1,61 @@ +body { margin: 0; font-family: monospace; background-color: #FEF5ED; } + +.title { + text-align:center; + font-size:2.5em; +} + +.outline-text-2 { + display: flex; + flex-direction: row; + flex-wrap: wrap; + background-color: #D3E4CD; + text-align: center; + padding: 2rem 10rem; +} + +.outline-text-2 > * { + margin: 1rem auto; +} + +table { border-collapse: collapse; } + +img { max-width:100%; } + +table { + margin-top:2rem; + margin-right:2rem; +} + +table > :is(thead, tbody) > tr > :is(th, td) { + padding: 3px; + text-align: left; +} + +table > thead > tr > :is(th, td) { + border-top: 2px solid; + border-bottom: 1px solid; +} + +table > tbody > tr:last-child > :is(th, td) { border-bottom: 2px solid; } + +h2, h3, h4, h5, h6, p, ul { + max-width: 50rem; + margin: 1rem auto; +} + +a { + text-decoration: none; + color: #C37B89; +} + +a:hover { font-weight: bold; } + +#table-of-contents ul { + list-style-type: none; +} + +#postamble { padding: 1.5rem 0; text-align: center; } +#postamble ul li { display: inline-block; } +#postamble ul { padding: 0; } +#postamble li { margin-right: 2em; } diff --git a/notes/5c6faa9f-2ae4-4dda-83a6-00f283ce2ea3.org b/notes/5c6faa9f-2ae4-4dda-83a6-00f283ce2ea3.org index 21c7248..0b08a1b 100644 --- a/notes/5c6faa9f-2ae4-4dda-83a6-00f283ce2ea3.org +++ b/notes/5c6faa9f-2ae4-4dda-83a6-00f283ce2ea3.org @@ -104,71 +104,71 @@ #+caption: Design size relative to Vericert. | benchmark | vericert-list | vericert-hyper | |----------------+---------------+----------------| -| 2mm | 1.8148148 | 1.5555556 | -| 3mm | 1.6247906 | 1.5311760 | -| adi | 1.6864583 | 1.3051189 | -| atas | 1.4228029 | 1.1908549 | -| bicg | 1.3006993 | 1.1137725 | -| cholesky | 2.2895054 | 1.7804878 | -| covariance | 1.0145719 | 0.98584071 | -| doitgen | 1.8436019 | 1.7212389 | -| durbin | 1.2598291 | 0.94487179 | -| fdtd-2d | 1.8102625 | 1.5752856 | -| floyd-warshall | 1.2016129 | 0.90211907 | -| gemm | 1.3737624 | 1.1948332 | -| gemver | 1.3281991 | 1.2497213 | -| gesummv | 1.3213333 | 1.0667384 | -| heat-3d | 1.7933579 | 1.7587455 | -| jacobi-1d | 1.6877323 | 1.3841463 | -| jacobi-2d | 1.5256849 | 1.3707692 | -| lu | 2.1350365 | 1.6447985 | -| ludcmp | 2.2989324 | 1.7845304 | -| mvt | 1.7512847 | 1.3708769 | -| nussinov | 1.4447717 | 1.1678571 | -| seidel-2d | 1.6851852 | 1.6545455 | -| symm | 1.7689694 | 1.4516729 | -| syr2k | 1.5592255 | 1.3608350 | -| syrk | 1.3641882 | 1.2148649 | -| trisolv | 1.3314607 | 1.3699422 | -| trmm | 1.5706714 | 1.2772989 | +| 2mm | 0.55102041 | 0.64285714 | +| 3mm | 0.61546392 | 0.65309278 | +| adi | 0.59295862 | 0.76621371 | +| atas | 0.70283806 | 0.83973289 | +| bicg | 0.76881720 | 0.89784946 | +| cholesky | 0.43677555 | 0.56164384 | +| covariance | 0.98563734 | 1.0143627 | +| doitgen | 0.54241645 | 0.58097686 | +| durbin | 0.79375848 | 1.0583446 | +| fdtd-2d | 0.55240606 | 0.63480554 | +| floyd-warshall | 0.83221477 | 1.1085011 | +| gemm | 0.72792793 | 0.83693694 | +| gemver | 0.75289920 | 0.80017841 | +| gesummv | 0.75681130 | 0.93743693 | +| heat-3d | 0.55761317 | 0.56858711 | +| jacobi-1d | 0.59251101 | 0.72246696 | +| jacobi-2d | 0.65544332 | 0.72951740 | +| lu | 0.46837607 | 0.60797721 | +| ludcmp | 0.43498452 | 0.56037152 | +| mvt | 0.57100939 | 0.72946009 | +| nussinov | 0.69215087 | 0.85626911 | +| seidel-2d | 0.59340659 | 0.60439560 | +| symm | 0.56530090 | 0.68886044 | +| syr2k | 0.64134405 | 0.73484295 | +| syrk | 0.73303671 | 0.82313682 | +| trisolv | 0.75105485 | 0.72995781 | +| trmm | 0.63667042 | 0.78290214 | #+tblfm: $1='(identity remote(raw-vericert,@@#$1)) -#+tblfm: $2=(remote(raw-vericert,@@#$2))/(remote(raw-vericert-list,@@#$2)) -#+tblfm: $3=(remote(raw-vericert,@@#$2))/(remote(raw-vericert-hyper,@@#$2)) +#+tblfm: $2=remote(raw-vericert-list,@@#$2)/remote(raw-vericert,@@#$2) +#+tblfm: $3=remote(raw-vericert-hyper,@@#$2)/remote(raw-vericert,@@#$2) #+name: vericert-processed-speed #+caption: Execution time relative to Vericert. | benchmark | vericert-list | vericert-hyper | |----------------+---------------+----------------| -| 2mm | 0.10964074 | 0.11388448 | -| 3mm | 0.11272619 | 0.11380653 | -| adi | 0.11254961 | 0.11188351 | -| atas | 0.25071807 | 0.25060733 | -| bicg | 0.25128535 | 0.25837004 | -| cholesky | 0.10709267 | 0.10837778 | -| covariance | 0.23328600 | 0.23503192 | -| doitgen | 0.10006043 | 0.10025617 | -| durbin | 0.91718661 | 0.88748628 | -| fdtd-2d | 0.25191744 | 0.24256082 | -| floyd-warshall | 0.24512275 | 0.24528405 | -| gemm | 0.24217108 | 0.23782250 | -| gemver | 0.080719653 | 0.082348805 | -| gesummv | 0.11018493 | 0.11693428 | -| heat-3d | 0.26189422 | 0.26387960 | -| jacobi-1d | 1.0273277 | 0.99205979 | -| jacobi-2d | 0.24812968 | 0.24891972 | -| lu | 0.10784972 | 0.10553413 | -| ludcmp | 0.10642397 | 0.11109796 | -| mvt | 0.096198062 | 0.099829570 | -| nussinov | 0.23680025 | 0.24543956 | -| seidel-2d | 0.25317479 | 0.24189279 | -| symm | 0.23900415 | 0.24417126 | -| syr2k | 0.23700960 | 0.24042125 | -| syrk | 0.24829032 | 0.24812610 | -| trisolv | 0.11345693 | 0.11485735 | -| trmm | 0.25103069 | 0.24199603 | +| 2mm | 1.2393550 | 1.3193459 | +| 3mm | 1.0406310 | 1.0691453 | +| adi | 1.6989371 | 1.7841801 | +| atas | 1.7042355 | 1.7573209 | +| bicg | 1.3871443 | 1.5116517 | +| cholesky | 2.1325655 | 2.1807541 | +| covariance | 1.5601721 | 1.5734386 | +| doitgen | 1.4150096 | 1.4667253 | +| durbin | 1.4929575 | 1.4639101 | +| fdtd-2d | 2.0109333 | 1.9531624 | +| floyd-warshall | 1.5009203 | 1.5265074 | +| gemm | 1.8164517 | 1.8267222 | +| gemver | 0.61138862 | 0.65725835 | +| gesummv | 0.61119401 | 0.70603981 | +| heat-3d | 4.8476335 | 4.8862898 | +| jacobi-1d | 1.9265164 | 1.8779918 | +| jacobi-2d | 2.1036175 | 2.1117803 | +| lu | 2.1040334 | 2.0776318 | +| ludcmp | 1.9413973 | 2.0458566 | +| mvt | 0.65306506 | 0.72427034 | +| nussinov | 1.4218161 | 1.5819546 | +| seidel-2d | 2.6126228 | 2.4972927 | +| symm | 1.9968355 | 2.0888539 | +| syr2k | 2.1421494 | 2.2394619 | +| syrk | 1.8170795 | 1.8609272 | +| trisolv | 0.96431031 | 0.98299182 | +| trmm | 1.8747092 | 1.8330768 | #+tblfm: $1='(identity remote(raw-vericert,@@#$1)) -#+tblfm: $2=(remote(raw-vericert,@@#$3) * remote(raw-vericert,@@#$4))/(remote(raw-vericert-list,@@#$3) * remote(raw-vericert-list,@@#$4)) -#+tblfm: $3=(remote(raw-vericert,@@#$3) * remote(raw-vericert,@@#$4))/(remote(raw-vericert-hyper,@@#$3) * remote(raw-vericert-hyper,@@#$4)) +#+tblfm: $2=(remote(raw-vericert,@@#$4) * remote(raw-vericert,@@#$5))/(remote(raw-vericert-list,@@#$4) * remote(raw-vericert-list,@@#$5)) +#+tblfm: $3=(remote(raw-vericert,@@#$4) * remote(raw-vericert,@@#$5))/(remote(raw-vericert-hyper,@@#$4) * remote(raw-vericert-hyper,@@#$5)) * Plots :PROPERTIES: @@ -185,8 +185,8 @@ set style data histogram set style fill solid set log y -set yrange [1:3] -set ytics 0.5 nologscale +set yrange [0.4:1.2] +set ytics 0.1,0.2,1.2 set ylabel "Design size relative to Vericert" set xtics rotate nomirror @@ -209,7 +209,7 @@ set style data histogram set style fill solid set log y -set yrange [0.05:1.2] +set yrange [0.5:6] set ytics 0.01,0.1,1 set ylabel "Execution time relative to Vericert" diff --git a/publish.el b/publish.el index 76019f5..4467668 100644 --- a/publish.el +++ b/publish.el @@ -51,46 +51,7 @@ :html-postamble "" - :html-head "") + :html-head "") (list "ymhg-notes-static" :base-directory (concat ymhg-notes-dir "notes/static") :include '() @@ -99,4 +60,9 @@ h2, h3, h4, h5, h6, p, ul { :publishing-directory (concat ymhg-notes-dir "public/static") :publishing-function #'org-publish-attachment :recursive t) - (list "ymhg-notes" :components '("ymhg-notes-org" "ymhg-notes-static")))) + (list "ymhg-notes-css" + :base-directory (concat ymhg-notes-dir "css") + :base-extension "css" + :publishing-directory (concat ymhg-notes-dir "public/css") + :publishing-function #'org-publish-attachment) + (list "ymhg-notes" :components '("ymhg-notes-org" "ymhg-notes-static" "ymhg-notes-css")))) -- cgit