From c391cfc5b66d651cd36a792ef5b5526dd934b57c Mon Sep 17 00:00:00 2001 From: Benedikt Schesch <37979523+benedikt-schesch@users.noreply.github.com> Date: Thu, 6 Jun 2024 10:55:45 -0700 Subject: [PATCH] Add timing (#301) --- .../combined/plots/all/cost_with_manual.pdf | Bin 39123 -> 39123 bytes .../plots/all/cost_without_manual.pdf | Bin 39047 -> 39047 bytes results/combined/plots/all/heatmap.pdf | Bin 49493 -> 49493 bytes .../combined/plots/git/cost_with_manual.pdf | Bin 36900 -> 36900 bytes .../plots/git/cost_without_manual.pdf | Bin 36535 -> 36535 bytes results/combined/plots/git/heatmap.pdf | Bin 39850 -> 39850 bytes .../combined/plots/tools/cost_with_manual.pdf | Bin 38248 -> 38248 bytes .../plots/tools/cost_without_manual.pdf | Bin 38165 -> 38165 bytes results/combined/plots/tools/heatmap.pdf | Bin 44419 -> 44419 bytes .../combined/tables/all/table_run_time.tex | 25 ++++++++++++++++++ .../combined/tables/git/table_run_time.tex | 14 ++++++++++ .../combined/tables/tools/table_run_time.tex | 19 +++++++++++++ .../plots/all/cost_with_manual.pdf | Bin 39104 -> 39104 bytes .../plots/all/cost_without_manual.pdf | Bin 39026 -> 39026 bytes results/greatest_hits/plots/all/heatmap.pdf | Bin 49812 -> 49812 bytes .../plots/git/cost_with_manual.pdf | Bin 36841 -> 36841 bytes .../plots/git/cost_without_manual.pdf | Bin 36533 -> 36533 bytes results/greatest_hits/plots/git/heatmap.pdf | Bin 38540 -> 38540 bytes .../plots/tools/cost_with_manual.pdf | Bin 38231 -> 38231 bytes .../plots/tools/cost_without_manual.pdf | Bin 38156 -> 38156 bytes results/greatest_hits/plots/tools/heatmap.pdf | Bin 44752 -> 44752 bytes .../tables/all/table_run_time.tex | 25 ++++++++++++++++++ .../tables/git/table_run_time.tex | 14 ++++++++++ .../tables/tools/table_run_time.tex | 19 +++++++++++++ results/reaper/plots/all/cost_with_manual.pdf | Bin 39138 -> 39138 bytes .../reaper/plots/all/cost_without_manual.pdf | Bin 39034 -> 39034 bytes results/reaper/plots/all/heatmap.pdf | Bin 49274 -> 49274 bytes results/reaper/plots/git/cost_with_manual.pdf | Bin 36900 -> 36900 bytes .../reaper/plots/git/cost_without_manual.pdf | Bin 36536 -> 36536 bytes results/reaper/plots/git/heatmap.pdf | Bin 39831 -> 39831 bytes .../reaper/plots/tools/cost_with_manual.pdf | Bin 38260 -> 38260 bytes .../plots/tools/cost_without_manual.pdf | Bin 38163 -> 38163 bytes results/reaper/plots/tools/heatmap.pdf | Bin 44163 -> 44163 bytes run.sh | 1 + 34 files changed, 117 insertions(+) create mode 100644 results/combined/tables/all/table_run_time.tex create mode 100644 results/combined/tables/git/table_run_time.tex create mode 100644 results/combined/tables/tools/table_run_time.tex create mode 100644 results/greatest_hits/tables/all/table_run_time.tex create mode 100644 results/greatest_hits/tables/git/table_run_time.tex create mode 100644 results/greatest_hits/tables/tools/table_run_time.tex diff --git a/results/combined/plots/all/cost_with_manual.pdf b/results/combined/plots/all/cost_with_manual.pdf index 46c069cf11d4d79018ed56d73928ed1538e8bd60..c85e2211ba14e06f3658b018f1a8e9144ca54d65 100644 GIT binary patch delta 99 zcmcb-k?HbArUesOOe{<+CbLYu4rXk=Kk*x@v#F(_ldGw#shgp*nVFljlcAB5v8khp XnX$2flaZ5?qn&~cAtjR~X6yz46Z0I1 delta 99 zcmcb-k?HbArUesOj0_CSCbLYu4rXk=Kk*x@v!k1{tGR`%xsj2pxw(^xsf)9vo2#?2 XtDBjbv$L~-shxriAtjR~X6yz4BQhNl diff --git a/results/combined/plots/all/cost_without_manual.pdf b/results/combined/plots/all/cost_without_manual.pdf index 573737606dd5d75b010d3286105f088928fc3c64..cfc94184ea23d8d3331cd587bfe84e7e504f24b0 100644 GIT binary patch delta 100 zcmZqQ$ke`(X~TvIEG8Bv=99NfxDIA)?w|OT)!D_((8AKm&CSTz#mLRg!qv>#($&$x Y)X>G!)y&+?+|*9NhLDoU$EP0v09ZpF9smFU delta 100 zcmZqQ$ke`(X~TvIEJg+frjxf!xDIA)?w|OT)!E$A!qL#&$imsx+|}6G(b&Y)#L&Re Y!o=CY*udP<$kI;1hLDoU$EP0v04V_-4gdfE diff --git a/results/combined/plots/all/heatmap.pdf b/results/combined/plots/all/heatmap.pdf index 2294acc9d4163ed07374841c7d75609d985d5a75..a960027e1a31dc1736ed602ce30180fae8dc5d51 100644 GIT binary patch delta 100 zcmccG#C)}hc|+e$7845-v&oZoUI#Na=kB`6>g;A}Vq#)x=gLrBTw&I4xvSNk38 delta 100 zcmccG#C)}hc|+e$79#@#lgX2IUI#Na=kB`6>g?=fVQOk_U}oTE;$md!>g?)h=Iml% XWNcyXWa((+>}scALrBTw&I4xvRWu#; diff --git a/results/combined/plots/git/cost_with_manual.pdf b/results/combined/plots/git/cost_with_manual.pdf index e5699cbe255225c5bbd295611ed9cbb34f75f8db..6f34f4bfa053851bf6e66ef8008cba43c69620f9 100644 GIT binary patch delta 100 zcmZ3ofN9ABrVXJTEG8DF#*-sEu7eqyO*&t(IvX1~yBS+L8@L%eyEz*fIvbmsx|kXp X7#SNFn!B1AJK8DO5K=NZvHvgt+m;*A delta 100 zcmZ3ofN9ABrVXJTEJg+f7Ly}8u7eqyO*&t(IvbcfIXW8~8=JXW7#JG4np(Ixxi}e^ Xm^zy~yP267o7pMY5K=NZvHvgt*sL4% diff --git a/results/combined/plots/git/cost_without_manual.pdf b/results/combined/plots/git/cost_without_manual.pdf index 178614394e30c3396860e4c83993fd6f4b867544..e346c25d96f383282e0b707ff83856b10b5a69f6 100644 GIT binary patch delta 99 zcmdl!mudT4rVXFlSWGNTjV6C@yAEO)Z@$$2oYl$L$l1-<(%Hbx*xAk5$k5r?)YQe) Z*ucoxz|h>)%-GRR!G?g6$-jH|003r@9uNQk delta 99 zcmdl!mudT4rVXFlSd0t|%qM?uyAEb-zSRDl)yd4v#LU#$#Kp+i#n{Qxz{thL)y>Vt Y#lX?o)x^x)($P-AhJcdEzkBxp0B{!`sQ>@~ diff --git a/results/combined/plots/git/heatmap.pdf b/results/combined/plots/git/heatmap.pdf index 837f99b855e09481ad8b21542a1630fe81746761..daf33246d4d1831c0a8ab193de41b02af968acc4 100644 GIT binary patch delta 100 zcmZ3rooUr}rVU>wvzSMIlZ_s& delta 100 zcmZ3rooUr}rVU>wvltl|m{0yW`8t@f`O1`2tj=a;CT6D2CN4(CF2+ul21YI}u5NBF YE(VUyt|n&YmX3A`HiVQ+emLtS0G)Lo6#xJL diff --git a/results/combined/plots/tools/cost_with_manual.pdf b/results/combined/plots/tools/cost_with_manual.pdf index dbc5da6091bc936eaa4e630f9e080d90d724fab4..1f63004785623b52ea1ef73cd693286d9a5a0acc 100644 GIT binary patch delta 100 zcmaE{is{8FrVVp?SxhWUEhaDMy$)tTGK4YG`h1W@zAI?&56dYV2g-Xl&x_ YXk=*aX5nmPW@e{gLrBTwHBg;G?DK!>=bMWDVe-x${qlA>>gGC diff --git a/results/combined/plots/tools/cost_without_manual.pdf b/results/combined/plots/tools/cost_without_manual.pdf index a7a651b76f8de1667d34a9a1ca3077b02975a8d0..80b7896e4f835a22fbcf05453dca4d834130d2e9 100644 GIT binary patch delta 100 zcmbQbifQU9rVXyWEG8DF7Lz@DuY(zzRr+4DI-4518k(D$85+2lyEq%V8ao*{8k;yf X8X20qSvVV+nb|4W5K=NZXv$##%)%S9 delta 100 zcmbQbifQU9rVXyWEJg-~29rH|uY(zzRr+4DI-8g~89SPpnY$S{8oM}JI$1awSeQFH XIXk%+n>e|;8rUh=5K=NZXv$##)ZZK} diff --git a/results/combined/plots/tools/heatmap.pdf b/results/combined/plots/tools/heatmap.pdf index af6b784f9c5c183b2689738261d3f3dd4d66eb06..b60f8aca5252bf3b7ef92047f04750c8075bdf84 100644 GIT binary patch delta 100 zcmZp^&D4CGX~XfQEG8DF=95n^y$)tE!PX0LI1`Cij*?e~5S5{{;XJ-pna}xs#3o}dP5wCH1`Cij-h6iAS5{{y3nybkOJ{QnHxp+kQv(+_Hz#ug ZBS#~1BXbKAM;BK+1sg(2CbQ1i4FHiz9sB?Q diff --git a/results/greatest_hits/plots/all/cost_without_manual.pdf b/results/greatest_hits/plots/all/cost_without_manual.pdf index da0266e8092c2bf368a757acb81933ebf8943543..df2f3e71f2af71cccaf15fd83f36640e52604d25 100644 GIT binary patch delta 100 zcmeygf$7r*rVaBau$WjH8c$w4;X0VHxo+ZDR%a7)OJg?^3l~!Z3u6OEOLJ#80~bqU YS7Q@rQzu7PXGc2)8$wDZZ=1dc0DgWRQUCw| delta 100 zcmeygf$7r*rVaBauoxK_8BJb1;X0VHxo+ZDR%cgp7gt9k7b8i&dBeF~%qEtGlP~VN!2+a>Hm}`%i`CiH#LUgy&D_w@z|z>##mLam($&<^ Z&D_Pz#ni>o!py=>!G@5M$)^sU0sv6x9w`6- delta 99 zcmbQz$~>i&dBeF~%ti)AlP~VN!2+ZWH?Q4&i`CiK+1bU>(8a{uz}Usm!p+Rc*~!qw Z!r9r-+{nev$lSzE!G@5M$)^sU0sv4z9xwm^ diff --git a/results/greatest_hits/plots/git/cost_with_manual.pdf b/results/greatest_hits/plots/git/cost_with_manual.pdf index eb75e19ebbbad7637a6abe935d3260172237086b..f5706195c47fb4cc280cd82dddb91deddbdb6feb 100644 GIT binary patch delta 100 zcmaDkpXud%rVR=mEGCwQW|LJqu7eqy|98A%bvAG_ay2(KHgz*MGjud^HZ(9cadvTY XadNb@v~V_cHL+8$A*5uoPXAs2E}|Uh delta 100 zcmaDkpXud%rVR=mEJg-Krju1Vu7eqy|98A%b#`$zurP79baZrfv~)CZa&j?rajmMxSE?7SXh|3ni)7d8n`)Ix|%qe VI2#xPdFGCG3O0n4Og=F63;;2>9ku`f delta 98 zcmeBK%ha=$X~Ug9W+MZm$@lwifauM;`VX@@JDZq0nHv~dx*D6fxmlPvSsJ;TI$1cI W8k$)+x;U9S+bP%(QZo6#)H47nCmo~! diff --git a/results/greatest_hits/plots/tools/cost_with_manual.pdf b/results/greatest_hits/plots/tools/cost_with_manual.pdf index 638cd822906e20b223e63802064c9f9bb2720d7c..4e8e012845fbc6bdb8246a3ae955e6903318c629 100644 GIT binary patch delta 100 zcmcbj2b#}HiGc$HGGcj2bv83FbaOK>G&VGGbTe{xbTcuraCJ0x XGIDbBI*S0e*+ Y0}CTd14Abh6E`~r8$wDZdrmnF0H)v@KmY&$ delta 99 zcmeBK#niKkX@gBKvyp+(Wc%J5EI`_Pvvl8UR%bHiv9M>i7_3s*;D YCnGl(GecuzGebKC8$wDZdrmnF0H3lOHvj+t diff --git a/results/greatest_hits/plots/tools/heatmap.pdf b/results/greatest_hits/plots/tools/heatmap.pdf index b611316ead84cdf8c67994e66ca94dcaf5b80735..3182b81c42917ef57e105996c99955947a502102 100644 GIT binary patch delta 100 zcmca`m+8V?rVRqiSxhVq%_oa2zYb<>e!u)8tFxP-k%f_kfwQ@hvyro_p@osNvw^d- YiG`7Yv#W`#o4K8W4Iw3ynb(~K08Z&0H~;_u delta 100 zcmca`m+8V?rVRqiS&R&f%qEL0zYb<>e!u)8tFyC{sf&w?rHh-TqqC8*nT5Hto2!K@ WkZs^%WNvBZVy9q3NXca8b!P!;>K)bq diff --git a/results/greatest_hits/tables/all/table_run_time.tex b/results/greatest_hits/tables/all/table_run_time.tex new file mode 100644 index 0000000000..b757844cd4 --- /dev/null +++ b/results/greatest_hits/tables/all/table_run_time.tex @@ -0,0 +1,25 @@ +% Do not edit. This file is automatically generated. +\begin{tabular}{c|c|c|c} + & \multicolumn{3}{c}{Run time (seconds)} \\ + Tool & Mean & Median & Max \\ + \hline + Gitmerge-ort & 0.05 & 0.05 & 0.14 \\ + Gitmerge-ort-ignorespace & 0.05 & 0.05 & 0.14 \\ + Gitmerge-recursive-histogram & 0.06 & 0.05 & 0.25 \\ + Gitmerge-recursive-ignorespace & 0.06 & 0.05 & 0.25 \\ + Gitmerge-recursive-minimal & 0.06 & 0.05 & 0.26 \\ + Gitmerge-recursive-myers & 0.06 & 0.05 & 0.25 \\ + Gitmerge-recursive-patience & 0.06 & 0.05 & 0.26 \\ + Gitmerge-resolve & 0.26 & 0.19 & 2.24 \\ + Hires-Merge & 0.20 & 0.13 & 1.94 \\ + Spork & 1.74 & 1.03 & 19.0 \\ + IntelliMerge & 1.53 & 0.66 & 17.4 \\ + Plumelib-ort & 0.51 & 0.27 & 5.44 \\ + Plumelib-ort-ignorespace & 0.50 & 0.28 & 5.36 \\ + Plumelib-ort-adjacent & 0.17 & 0.10 & 2.65 \\ + Plumelib-ort-adjacent-ignorespace & 0.16 & 0.09 & 2.35 \\ + Plumelib-ort-imports & 0.46 & 0.27 & 4.29 \\ + Plumelib-ort-imports-ignorespace & 0.47 & 0.27 & 4.15 \\ + Plumelib-ort-version-number & 0.19 & 0.10 & 4.26 \\ + Plumelib-ort-version-number-ignorespace & 0.16 & 0.10 & 2.63 \\ +\end{tabular} diff --git a/results/greatest_hits/tables/git/table_run_time.tex b/results/greatest_hits/tables/git/table_run_time.tex new file mode 100644 index 0000000000..b36c632bab --- /dev/null +++ b/results/greatest_hits/tables/git/table_run_time.tex @@ -0,0 +1,14 @@ +% Do not edit. This file is automatically generated. +\begin{tabular}{c|c|c|c} + & \multicolumn{3}{c}{Run time (seconds)} \\ + Tool & Mean & Median & Max \\ + \hline + Gitmerge-ort & 0.05 & 0.05 & 0.14 \\ + Gitmerge-ort-ignorespace & 0.05 & 0.05 & 0.14 \\ + Gitmerge-recursive-histogram & 0.06 & 0.05 & 0.25 \\ + Gitmerge-recursive-ignorespace & 0.06 & 0.05 & 0.25 \\ + Gitmerge-recursive-minimal & 0.06 & 0.05 & 0.26 \\ + Gitmerge-recursive-myers & 0.06 & 0.05 & 0.25 \\ + Gitmerge-recursive-patience & 0.06 & 0.05 & 0.26 \\ + Gitmerge-resolve & 0.26 & 0.19 & 2.24 \\ +\end{tabular} diff --git a/results/greatest_hits/tables/tools/table_run_time.tex b/results/greatest_hits/tables/tools/table_run_time.tex new file mode 100644 index 0000000000..c1ef75f147 --- /dev/null +++ b/results/greatest_hits/tables/tools/table_run_time.tex @@ -0,0 +1,19 @@ +% Do not edit. This file is automatically generated. +\begin{tabular}{c|c|c|c} + & \multicolumn{3}{c}{Run time (seconds)} \\ + Tool & Mean & Median & Max \\ + \hline + Gitmerge-ort & 0.05 & 0.05 & 0.14 \\ + Gitmerge-ort-ignorespace & 0.05 & 0.05 & 0.14 \\ + Hires-Merge & 0.20 & 0.13 & 1.94 \\ + Spork & 1.74 & 1.03 & 19.0 \\ + IntelliMerge & 1.53 & 0.66 & 17.4 \\ + Plumelib-ort & 0.51 & 0.27 & 5.44 \\ + Plumelib-ort-ignorespace & 0.50 & 0.28 & 5.36 \\ + Plumelib-ort-adjacent & 0.17 & 0.10 & 2.65 \\ + Plumelib-ort-adjacent-ignorespace & 0.16 & 0.09 & 2.35 \\ + Plumelib-ort-imports & 0.46 & 0.27 & 4.29 \\ + Plumelib-ort-imports-ignorespace & 0.47 & 0.27 & 4.15 \\ + Plumelib-ort-version-number & 0.19 & 0.10 & 4.26 \\ + Plumelib-ort-version-number-ignorespace & 0.16 & 0.10 & 2.63 \\ +\end{tabular} diff --git a/results/reaper/plots/all/cost_with_manual.pdf b/results/reaper/plots/all/cost_with_manual.pdf index bc49d1398f4a768eba3b3da1ca8cdb046acc1c50..f291a26683d9906c6aae90a05841600380349052 100644 GIT binary patch delta 100 zcmaE~k?GM!rVU&ZSxhXA%qH_qybfZRZ+_R0qk)s5g^7iclaYn9tA&Y+rIDeV Zv6G3Tg`umffuo6?f(;=hla*#1001dO9Jl}g delta 100 zcmaE~k?GM!rVU&ZS&R&fO(*kBybfk;emU_QtFw`-ql=rXv6+RNo2#3nxwET@fr*i$ Yi?Oq_le2}Jp^Ke@4Iw3ym1Z0O08C09s{jB1 diff --git a/results/reaper/plots/all/cost_without_manual.pdf b/results/reaper/plots/all/cost_without_manual.pdf index b6f4f448c13846101a3a1bdf9d274ac6cca01515..ee8624dd5bafa7d6076309a0c4b58d272244182c 100644 GIT binary patch delta 100 zcmeyhf$7%hj!OABKob8|Zd8$wDZ@1MRK0E^omO8@`> delta 100 zcmeyhf$7%!2GL$dBf%%EGCvlrjxhtxDIA)p0x8OtFx1drHiGrrLl#nlcAZjk)f-(nVGS< Yvx}3Pn~9ULldGMA4Iw3y*X=(80H1vy00000 delta 100 zcmey>!2GL$dBf%%EJg;##*?@2xDIA)p0x8OtFxJrv$>&*shg9VnUjU9v5||RnTe5! YtErQbrG=rTiKCr@4Iw3y*X=(80FAC5dH?_b diff --git a/results/reaper/plots/git/cost_with_manual.pdf b/results/reaper/plots/git/cost_with_manual.pdf index fe136d64da0d30ef9f5a9f9beb03901c4bc90531..9c12a4b9296cdcbcad16112b3703f825ee93b413 100644 GIT binary patch delta 118 zcmZ3ofN9ABrVU{oEXF1V7L%hou7eqyO*>z)1{ydU8W@;6nK+vmnz@-;nmD=`nH#zq oI9Xa4n3`Ccn%ODX5L6P&rSFrPmtK;gU}#`C`C)_Rz)209zM85x+knHab@x*8a{x*0n;I=VVL o8#=n0n;ST}TG%Pr5L6P&rSFrPmtK;gU}#`C`C)_RSk*0YG`imVrcAQ WYG7t&0iriwZhyh*>}=>}WMJZEV&LNFYGCB*X6)qX=n52d VbTv0OaB{VT>xjF9qmS%PeHiVQ+K0E6a0Ccw=Q~&?~ diff --git a/results/reaper/plots/tools/cost_with_manual.pdf b/results/reaper/plots/tools/cost_with_manual.pdf index 3f138c23ed47c8c6a26deb8518069c966a36ca68..93313a8fee1921f5a34ff0228c0f2ac7aace727a 100644 GIT binary patch delta 100 zcmeyeis{QLrVYz_S&U5#4JWVay$)tTGD?;%4IH=3;1RU~FvWXm06ZWM*jU Y=;UhXX5{4T>Sm{4LrBTwZBzCE0D)B=Y5)KL delta 100 zcmeyeis{QLrVYz_S&R%!3?{GYy$)tg;S`ZeVEc=xk}^WMFP$?&9obZft01 YVP@&#;^yjNX=$fmLrBTwZBzCE0C(daHUIzs diff --git a/results/reaper/plots/tools/cost_without_manual.pdf b/results/reaper/plots/tools/cost_without_manual.pdf index de10e16052c0bca5631de288c47994d359b5c9a7..7e12ab603b74a553e259a044e34206a7279c1e27 100644 GIT binary patch delta 99 zcmbQdifQsHrVY-$EXF2=29w=;uY(zzmHJ+@I=ML;8koA7nj0IM85$ZI8Jd`x8Cp6y X8(Fv*T38r5I@>AO5KuDNf65U6m6RIe delta 99 zcmbQdifQsHrVY-$EJg;#mXqCkuY(zzmHJ+@I$5}wxSATdxS5(dni)I08abPrx|o_8 XyO~)U7#cVlINK@M5KuDNf65U6v<4f4 diff --git a/results/reaper/plots/tools/heatmap.pdf b/results/reaper/plots/tools/heatmap.pdf index b8bf3b6595eada2dbee5e465b05f7d35dd3183e9..d084c2d3331026e883b05350c81bc15f09008f13 100644 GIT binary patch delta 100 zcmZp^$<%z4X~WSaEXF1VmXl8|xejJ*Ub6HutFwWtnX!wxi>tGXv!SE2laaBJn~|fL Yi?O+}v7wQxp{1RI4Iw3ycdb4N0D!a}WdHyG delta 100 zcmZp^$<%z4X~WSaEJg;#7L!jdxejJ*Ub6HutFw!fxsj8JlbM@|sjG#tft#tNv8Abt YiLsG^iGi7go3WjO4Iw3ycdb4N0B)5X^8f$< diff --git a/run.sh b/run.sh index 9edc981fe1..8f200b39ee 100755 --- a/run.sh +++ b/run.sh @@ -67,6 +67,7 @@ if [ "$only_plotting" = true ]; then --run_name "$RUN_NAME" \ --merges_path "$OUT_DIR/merges/" \ --tested_merges_path "$OUT_DIR/merges_tested/" \ + --timed_merges_path "$OUT_DIR/merges_timed/" \ --analyzed_merges_path "$OUT_DIR/merges_analyzed/" \ --full_repos_csv "$REPOS_CSV_WITH_HASHES" \ --repos_head_passes_csv "$OUT_DIR/repos_head_passes.csv" \