Fix data

8 files changed, 104 insertions, 106 deletions

diff --git a/data/bambu-area.csv b/data/bambu-area.csv
index 1baaa76..4e8b681 100644
--- a/data/bambu-area.csv
+++ b/data/bambu-area.csv
@@ -1,28 +1,26 @@
 benchmark,lut_flip_flop,slice,regs,luts,ramfifo,iopin,dsps,power,delay,cycles
-cholesky,1357,910,2071,3080,8,0,3,0.148,9.509,432503
-mvt,689,594,1442,1616,8,0,6,0.145,8.79,36958
-trmm,628,488,1113,1460,3,0,3,0.135,8.396,42642
-gemm,803,651,1568,1882,5,0,6,0.138,7.924,88052
-durbin,566,412,921,1414,3,0,6,0.15,9.202,7454
-atas,456,370,806,1119,6,0,3,0.146,7.608,22628
-trisolv,345,284,698,844,6,0,3,0.143,7.151,9468
-symm,894,663,1617,1949,5,0,6,0.138,8.335,50392
 2mm,1220,949,1986,2868,5,0,6,0.151,8.676,82724
+3mm,1293,1061,2209,3244,8,0,6,0.161,9.383,126860
+adi,1057,866,1775,2770,4,0,9,0.152,9.584,218309
+atas,456,370,806,1119,6,0,3,0.146,7.608,22628
+bicg,614,533,1285,1397,8,0,9,0.142,7.78,30060
+cholesky,1357,910,2071,3080,8,0,3,0.148,9.509,432503
 covariance,594,536,1193,1508,5,0,6,0.144,8.417,91654
-jacobi-1d,325,225,617,646,2,0,0,0.131,8.183,4717
-gemver,516,501,1030,1587,11,0,9,0.162,8.615,39318
 doitgen,792,632,1410,1862,4,0,6,0.139,8.409,85427
-nussinov,662,455,1049,1509,9,0,0,0.142,9.187,236267
+durbin,566,412,921,1414,3,0,6,0.15,9.202,7454
+fdtd-2d,856,680,1525,2195,7,0,3,0.143,8.552,101407
+floyd-warshall,529,350,859,1123,8,0,3,0.143,7.855,998008
+gemm,803,651,1568,1882,5,0,6,0.138,7.924,88052
+gesummv,583,461,1069,1265,6,0,9,0.137,7.84,24736
+heat-3d,818,680,1439,2151,4,0,3,0.145,9.172,50107
+jacobi-1d,325,225,617,646,2,0,0,0.131,8.183,4717
 jacobi-2d,715,525,1157,1562,4,0,3,0.133,8.083,73516
 lu,1249,885,1990,2914,8,0,3,0.15,9.778,503642
-ludcmp,1728,1222,2363,4177,11,0,3,0.164,9.881,458706
-bicg,614,533,1285,1397,8,0,9,0.142,7.78,30060
-heat-3d,818,680,1439,2151,4,0,3,0.145,9.172,50107
-3mm,1293,1061,2209,3244,8,0,6,0.161,9.383,126860
-fdtd-2d,856,680,1525,2195,7,0,3,0.143,8.552,101407
+mvt,689,594,1442,1616,8,0,6,0.145,8.79,36958
+nussinov,662,455,1049,1509,9,0,0,0.142,9.187,236267
 seidel-2d,521,405,954,1133,4,0,3,0.143,8.638,172996
+symm,894,663,1617,1949,5,0,6,0.138,8.335,50392
 syr2k,825,636,1582,1829,6,0,9,0.138,7.783,76378
-adi,1057,866,1775,2770,4,0,9,0.152,9.584,218309
-floyd-warshall,529,350,859,1123,8,0,3,0.143,7.855,998008
-gesummv,583,461,1069,1265,6,0,9,0.137,7.84,24736
 syrk,788,605,1372,1754,4,0,6,0.136,7.754,68228
+trisolv,345,284,698,844,6,0,3,0.143,7.151,9468
+trmm,628,488,1113,1460,3,0,3,0.135,8.396,42642
diff --git a/data/ludcmpbambu.csv b/data/ludcmpbambu.csv
new file mode 100644
index 0000000..cd01820
--- /dev/null
+++ b/data/ludcmpbambu.csv
@@ -0,0 +1,2 @@
+ludcmp,1728,1222,2363,4177,11,0,3,0.164,9.881,458706
+gemver,516,501,1030,1587,11,0,9,0.162,8.615,39318
diff --git a/data/slice-ratio.csv b/data/slice-ratio.csv
index 623e8d9..0903ded 100644
--- a/data/slice-ratio.csv
+++ b/data/slice-ratio.csv
@@ -1,27 +1,26 @@
 benchmark,vericert,vericert-fun
+2mm,1.629083,1.046365
+3mm,1.403393,0.850141
+adi,4.038106,0
+atas,1.297297,1.297297
+bicg,1.476548,1.129456
 cholesky,1.528571,1.078022
-mvt,2.521886,0.954545
-trmm,1.440574,1.17418
-gemm,1.465438,1.119816
+covariance,1.119403,0.927239
+doitgen,1.267405,1.05538
 durbin,1.616505,1.13835
-atas,1.297297,1.297297
-trisolv,1.274648,1.221831
+fdtd-2d,1.511765,1.216176
+floyd-warshall,2.317143,1.368571
+gemm,1.465438,1.119816
+gesummv,1.880694,1.310195
+heat-3d,1.642647,1.6
+jacobi-1d,1.711111,1.431111
+jacobi-2d,1.234286,1.127619
+lu,1.484746,1.010169
+mvt,2.521886,0.954545
+nussinov,1.468132,1.523077
+seidel-2d,1.298765,1.281481
 symm,1.624434,1.19457
-2mm,1.629083,1.046365
-covariance,1.119403,0.927239
-jacobi-1d,3.56,2.964444
-gemver,1.333333,1.383234
-doitgen,0.609177,0.509494
-nussinov,1.424176,1.301099
-jacobi-2d,1.499048,1.146667
-lu,1.262147,1.229379
-ludcmp,1.218494,0.738134
-bicg,1.928705,1.551595
-heat-3d,0.773529,0.763235
-3mm,1.098963,0.67295
-fdtd-2d,5.142647,0
-seidel-2d,2.002469,1.182716
-syr2k,1.363208,0.949686
-adi,1.517321,1.032333
-floyd-warshall,2.108571,1.725714
-gesummv,1.759219,1.310195
+syr2k,1.833333,1.122642
+syrk,1.219835,0.998347
+trisolv,1.274648,1.221831
+trmm,1.440574,1.17418
\ No newline at end of file
diff --git a/data/time-ratio.csv b/data/time-ratio.csv
index fea0796..e21bcc8 100644
--- a/data/time-ratio.csv
+++ b/data/time-ratio.csv
@@ -1,27 +1,26 @@
 benchmark,vericert,vericert-fun
+2mm,3.125391,2.933666
+3mm,2.324715,2.297549
+adi,4.099243,3.315808
+atas,2.513413,2.794423
+bicg,2.440026,2.467366
 cholesky,2.967234,2.827276
-mvt,2.021429,2.096388
-trmm,2.060691,2.126787
-gemm,2.592613,2.838367
+covariance,1.922089,1.893513
+doitgen,2.326549,2.27479
 durbin,1.632376,1.577759
-atas,2.513413,2.794423
-trisolv,2.22831,2.28662
+fdtd-2d,4.987489,4.690076
+floyd-warshall,2.962262,2.770747
+gemm,2.592613,2.838367
+gesummv,2.634895,2.842029
+heat-3d,6.020816,5.867394
+jacobi-1d,2.091957,2.163186
+jacobi-2d,2.864215,2.781176
+lu,2.675417,2.68872
+mvt,2.021429,2.096388
+nussinov,1.953448,1.968995
+seidel-2d,2.638452,2.639596
 symm,3.15331,3.127258
-2mm,3.125391,2.933666
-covariance,1.922089,1.893513
-jacobi-1d,43.298536,42.335268
-gemver,12.517913,12.617537
-doitgen,0.112407,0.116234
-nussinov,0.784121,0.761388
-jacobi-2d,0.960304,0.971064
-lu,0.561883,0.547565
-ludcmp,0.610521,0.603387
-bicg,18.494773,17.391895
-heat-3d,8.578985,8.582706
-3mm,2.214392,2.099631
-fdtd-2d,9.889776,7.999673
-seidel-2d,15.540121,14.535428
-syr2k,0.859594,0.927169
-adi,6.297165,6.328476
-floyd-warshall,0.408523,0.189116
-gesummv,9.108164,9.172071
+syr2k,4.4341,4.204305
+syrk,6.05352,2.80234
+trisolv,2.22831,2.28662
+trmm,2.060691,2.126787
\ No newline at end of file
diff --git a/data/vericert-full-inlining.csv b/data/vericert-full-inlining.csv
index ded73df..7ee8062 100644
--- a/data/vericert-full-inlining.csv
+++ b/data/vericert-full-inlining.csv
@@ -1,27 +1,26 @@
 benchmark,lut_flip_flop,slice,regs,luts,ramfifo,iopin,dsps,power,delay,cycles
-cholesky,719,1391,3666,2394,8,0,12,0.156,4.739,2575070
-mvt,812,1498,3892,2575,4,0,9,0.157,4.411,148874
-trmm,500,703,2170,1499,2,0,6,0.14,4.449,165829
-gemm,587,954,2809,2020,4,0,18,0.161,4.447,406775
-durbin,656,666,2097,1495,1,0,12,0.148,4.698,23833
-atas,346,480,1471,1007,4,0,6,0.135,4.258,101619
-trisolv,205,362,1177,590,4,0,3,0.128,4.185,36050
-symm,805,1077,3179,2470,4,0,21,0.162,4.733,279832
 2mm,808,1546,3866,2750,4,0,24,0.169,4.797,467612
+3mm,858,1489,3976,3010,8,0,21,0.163,4.577,604582
+adi,1990,3497,10185,5405,4,0,54,0.209,4.683,1831462
+atas,346,480,1471,1007,4,0,6,0.135,4.258,101619
+bicg,560,787,2515,1777,4,0,9,0.144,4.363,130791
+cholesky,719,1391,3666,2394,8,0,12,0.156,4.739,2575070
 covariance,388,600,1711,1217,4,0,6,0.136,4.351,340795
 doitgen,535,801,2392,1606,4,0,6,0.14,4.321,386783
-nussinov,516,668,1930,1541,8,0,0,0.136,4.433,956491
-jacobi-1d,255,385,1272,534,1,0,0,0.126,4.038,19997
-jacobi-2d,481,648,1997,1263,4,0,6,0.137,4.285,397200
-bicg,560,787,2515,1777,4,0,9,0.144,4.363,130791
-heat-3d,1051,1117,3232,2015,4,0,3,0.135,4.668,592771
-3mm,858,1489,3976,3010,8,0,21,0.163,4.577,604582
+durbin,656,666,2097,1495,1,0,12,0.148,4.698,23833
 fdtd-2d,750,1028,3179,1949,4,0,9,0.145,4.513,958412
-seidel-2d,393,526,1725,926,4,0,3,0.131,4.184,942338
-syr2k,630,1166,3182,2145,8,0,18,0.158,5.012,525908
-adi,1990,3497,10185,5405,4,0,54,0.209,4.683,1831462
 floyd-warshall,634,811,2645,2016,8,0,3,0.143,4.289,5414366
+gemm,587,954,2809,2020,4,0,18,0.161,4.447,406775
 gesummv,614,867,2842,1897,4,0,15,0.148,4.384,116557
+heat-3d,1051,1117,3232,2015,4,0,3,0.135,4.668,592771
+jacobi-1d,255,385,1272,534,1,0,0,0.126,4.038,19997
+jacobi-2d,481,648,1997,1263,4,0,6,0.137,4.285,397200
 lu,729,1314,3499,2300,8,0,9,0.154,4.554,2893147
+mvt,812,1498,3892,2575,4,0,9,0.157,4.411,148874
+nussinov,516,668,1930,1541,8,0,0,0.136,4.433,956491
+seidel-2d,393,526,1725,926,4,0,3,0.131,4.184,942338
+symm,805,1077,3179,2470,4,0,21,0.162,4.733,279832
+syr2k,630,1166,3182,2145,8,0,18,0.158,5.012,525908
 syrk,449,738,2278,1531,4,0,12,0.14,9.467,338286
-median,614,811,2645,1897,4,0,9,0.144,4.447,397200
+trisolv,205,362,1177,590,4,0,3,0.128,4.185,36050
+trmm,500,703,2170,1499,2,0,6,0.14,4.449,165829
diff --git a/data/vericert-fun.csv b/data/vericert-fun.csv
index 73580f9..46e67cb 100644
--- a/data/vericert-fun.csv
+++ b/data/vericert-fun.csv
@@ -1,27 +1,26 @@
 benchmark,lut_flip_flop,slice,regs,luts,ramfifo,iopin,dsps,power,delay,cycles
-cholesky,731,981,2922,1990,8,0,12,0.152,4.507,2579910
-mvt,394,567,1806,1046,4,0,9,0.144,4.419,154115
-trmm,484,573,1727,1127,2,0,6,0.136,4.527,168199
-gemm,450,729,1831,1315,4,0,18,0.153,4.803,412325
-durbin,507,469,1494,1044,1,0,12,0.143,4.526,23911
-atas,413,480,1452,972,4,0,6,0.138,4.521,106408
-trisolv,225,347,1091,591,4,0,3,0.132,4.199,36870
-symm,661,792,2291,1648,4,0,21,0.157,4.624,284062
 2mm,537,993,2333,1707,4,0,24,0.161,4.458,472304
+3mm,640,902,2422,1948,8,0,21,0.158,4.487,609502
+adi,3722,0,4263,3722,4,0,54,0.188,3.788,1831462
+atas,413,480,1452,972,4,0,6,0.138,4.521,106408
+bicg,404,602,1528,1029,4,0,9,0.14,4.251,135741
+cholesky,731,981,2922,1990,8,0,12,0.152,4.507,2579910
 covariance,397,497,1458,1101,4,0,6,0.139,4.27,342097
 doitgen,484,667,1935,1221,4,0,6,0.14,4.189,390095
-nussinov,521,693,1967,1564,8,0,0,0.135,4.468,956551
-jacobi-1d,272,322,1183,527,1,0,0,0.124,4.163,20057
-jacobi-2d,490,592,1908,1215,4,0,6,0.139,4.142,399000
-bicg,404,602,1528,1029,4,0,9,0.14,4.251,135741
-heat-3d,1120,1088,3434,2186,4,0,3,0.143,4.511,597771
-3mm,640,902,2422,1948,8,0,21,0.158,4.487,609502
+durbin,507,469,1494,1044,1,0,12,0.143,4.526,23911
 fdtd-2d,707,827,2418,1804,4,0,9,0.15,4.228,962012
-seidel-2d,416,519,1642,937,4,0,3,0.134,4.147,951158
-syr2k,503,714,2185,1407,8,0,18,0.157,4.696,532208
-adi,3722,0,4263,3722,4,0,54,0.188,3.788,1831462
 floyd-warshall,378,479,1494,995,8,0,3,0.134,3.992,5441098
+gemm,450,729,1831,1315,4,0,18,0.153,4.803,412325
 gesummv,481,604,1849,1184,4,0,15,0.149,4.517,122018
+heat-3d,1120,1088,3434,2186,4,0,3,0.143,4.511,597771
+jacobi-1d,272,322,1183,527,1,0,0,0.124,4.163,20057
+jacobi-2d,490,592,1908,1215,4,0,6,0.139,4.142,399000
 lu,746,894,2729,1893,8,0,9,0.147,4.569,2897987
+mvt,394,567,1806,1046,4,0,9,0.144,4.419,154115
+nussinov,521,693,1967,1564,8,0,0,0.135,4.468,956551
+seidel-2d,416,519,1642,937,4,0,3,0.134,4.147,951158
+symm,661,792,2291,1648,4,0,21,0.157,4.624,284062
+syr2k,503,714,2185,1407,8,0,18,0.157,4.696,532208
 syrk,420,604,1836,1141,4,0,12,0.144,4.325,342786
-median,484,604,1849,1215,4,0,9,0.143,4.458,399000
+trisolv,225,347,1091,591,4,0,3,0.132,4.199,36870
+trmm,484,573,1727,1127,2,0,6,0.136,4.527,168199
diff --git a/scripts/gen-data.rkt b/scripts/gen-data.rkt
index ca0e1fa..0b5707f 100644
--- a/scripts/gen-data.rkt
+++ b/scripts/gen-data.rkt
@@ -26,9 +26,11 @@
         ((= idx 0) (first lst))
         (else (nth (rest lst) (- idx 1)))))
 
-(define bambu-results (cdr (parse-csv "./data/bambu-area.csv")))
-(define vericert-full-inlining (cdr (parse-csv "./data/vericert-full-inlining.csv")))
-(define vericert-fun (cdr (parse-csv "./data/vericert-fun.csv")))
+(define (lt-list s1 s2) (string<? (car s1) (car s2)))
+
+(define bambu-results (sort (cdr (parse-csv "./data/bambu-area.csv")) lt-list))
+(define vericert-full-inlining (sort (cdr (parse-csv "./data/vericert-full-inlining.csv")) lt-list))
+(define vericert-fun (sort (cdr (parse-csv "./data/vericert-fun.csv")) lt-list))
 
 (define (get-row lst n)
   (map (lambda (x) (string->number (nth x n))) lst))
diff --git a/verified_resource_sharing.tex b/verified_resource_sharing.tex
index 5c7d44e..634282c 100644
--- a/verified_resource_sharing.tex
+++ b/verified_resource_sharing.tex
@@ -485,7 +485,7 @@ The bottom graph compares the execution time. We observe that \vericertfun{} gen
       xtick style={draw=none},
       ]
       
-      \nextgroupplot[ymin=0.2,ymax=5,ylabel={Area relative to \legup{}}, ytick={0.25,0.5,1,2,4}]
+      \nextgroupplot[ymin=0.5,ymax=8,ylabel={Area relative to \legup{}}, ytick={0.25,0.5,1,2,4}]
       \pgfplotsinvokeforeach{0,...,12}{%
         \backgroundbar{#1}}
       \backgroundbar[10]{13}
@@ -495,7 +495,7 @@ The bottom graph compares the execution time. We observe that \vericertfun{} gen
       % JW: redraw axis border which has been partially covered by the grey bars
       \draw (axis cs:-0.5,0.2) rectangle (axis cs:27.5,5);
 
-      \nextgroupplot[ymin=1,ymax=7,ylabel={Execution time relative to \legup{}}, ytick={1,2,4}]
+      \nextgroupplot[ymin=1,ymax=10,ylabel={Execution time relative to \legup{}}, ytick={1,2,4}]
       \pgfplotsinvokeforeach{0,...,12}{%
         \backgroundbar{#1}}
       \backgroundbar[10]{13}