Add dph-nbody test with the dph-lifted-copy library

3 files changed, 242 insertions, 1 deletions

diff --git a/testsuite/tests/dph/nbody/dph-nbody-copy-fast.stdout b/testsuite/tests/dph/nbody/dph-nbody-copy-fast.stdout
new file mode 100644
index 0000000000..69fdd8b303
--- /dev/null
+++ b/testsuite/tests/dph/nbody/dph-nbody-copy-fast.stdout
@@ -0,0 +1,100 @@
+    10.0     -7.88876745     14.40403609      0.07781862      1.41725313      0.00728077     -0.00615418
+    10.0    -20.39602554     -5.40256368     -1.56824530      0.67893475      0.01493099      0.00782011
+    10.0     -0.05794753     10.34183386      0.35651327      0.89460951      0.00188899     -0.00356931
+    10.0     -4.75609397     34.74782948      1.61195437      1.87077953      0.00587195     -0.01975082
+    10.0     36.25896362     10.82337782      2.14170846     -1.41319743     -0.02163268     -0.00507727
+    10.0      4.02674361     -9.00872919      0.03617254     -0.88316283     -0.00122400      0.00926493
+    10.0     42.00406508    -40.85785845     -0.76014767     -3.29738763     -0.02191949      0.02332737
+    10.0    -22.63186030      5.80994447     -1.07420146      1.51160117      0.01670201      0.00006355
+    10.0     16.53870540     16.94639077      1.84926442      0.20378411     -0.00879785     -0.00880553
+    10.0     39.92854878     29.06425991      2.88523318     -1.01552251     -0.02189971     -0.01632925
+    10.0    -17.45501954     11.39301477     -0.56641470      1.60906365      0.01371008     -0.00396360
+    10.0     26.25934753      8.00486951      1.85024443     -0.89918952     -0.01562756     -0.00309898
+    10.0     -9.33900099      9.24549389     -0.36060159      1.12461927      0.00801307     -0.00255620
+    10.0    -46.47873679    -28.36980232     -2.92763912      1.44708065      0.02528654      0.01949016
+    10.0    -12.54370842     34.21722863      1.24120256      2.21072951      0.01080973     -0.01869097
+    10.0     -7.14048930      7.10420057     -0.36081624      0.86670872      0.00647863     -0.00118788
+    10.0    -49.88492485    -23.33817148     -2.76602163      1.78294227      0.02720067      0.01682362
+    10.0    -19.81399282     53.52954568      2.07232227      2.65936299      0.01424146     -0.02727658
+    10.0     23.77418551     14.68227128      2.04725863     -0.41772276     -0.01379116     -0.00752371
+    10.0     -5.73673778      8.93192786     -0.16259409      0.97138466      0.00562305     -0.00245174
+    10.0     10.54277542     -1.02674862      0.84834041     -0.44100517     -0.00531874      0.00383461
+    10.0     23.01197723     21.12299112      2.25990543     -0.12607295     -0.01291140     -0.01176114
+    10.0    -44.78532667     12.05197921     -1.02696812      2.77848076      0.02808850     -0.00298275
+    10.0     31.46388060    -49.75461307     -1.52046945     -3.03579919     -0.01637469      0.02786471
+    10.0     24.84943257    -25.92687211     -0.24060772     -2.45045466     -0.01484349      0.01860299
+    10.0     25.91948874    -30.60444211     -0.52684367     -2.60005186     -0.01516185      0.02084074
+    10.0    -10.85946929     20.87407647      0.39902427      1.82589346      0.00972306     -0.01062660
+    10.0    -38.51435867      1.59076858     -1.56374573      2.10935343      0.02533138      0.00325720
+    10.0     48.51766969    -21.77175738      0.49039776     -3.14884736     -0.02642908      0.01352300
+    10.0      5.74566172     46.44110258      2.61301762      1.41963745     -0.00049448     -0.02602402
+    10.0    -22.88917903    -27.97906439     -2.49898486     -0.03157484      0.01438842      0.02110301
+    10.0     31.73261776     -6.28614087      1.21728705     -1.94829313     -0.01955786      0.00624200
+    10.0      4.24232124     19.44671943      1.21964188      1.10199242     -0.00052277     -0.01009959
+    10.0      0.91334970     48.66777413      2.53737735      1.69247032      0.00244742     -0.02680742
+    10.0     10.67139892     31.69558668      2.17625638      0.97201541     -0.00424894     -0.01856619
+    10.0     12.94163719     58.29627746      3.27732262      1.10311871     -0.00411829     -0.03016643
+    10.0     39.19514702     34.09017661      3.04651632     -0.83806079     -0.02092181     -0.01899392
+    10.0    -24.13067759    -32.16302812     -2.68262548     -0.04506858      0.01454248      0.02301772
+    10.0     51.78333979    -13.45956325      1.00920828     -3.03719366     -0.02816357      0.00875884
+    10.0    -18.73188233    -17.30379387     -1.95701398     -0.00677590      0.01307052      0.01538889
+    10.0     24.70514705    -49.06503148     -1.67808526     -2.78661149     -0.01337746      0.02867654
+    10.0    -51.06940692    -15.61458174     -2.46357376      2.08982818      0.02835174      0.01252356
+    10.0     -4.29154911    -29.69366786     -1.77081329     -1.27717018      0.00330457      0.02241695
+    10.0      2.11752441     33.61609431      1.87012243      1.50451828      0.00141129     -0.01940596
+    10.0     37.73902003    -20.32722331      0.42253535     -2.74138534     -0.02210996      0.01412198
+    10.0     18.24940441     16.13909492      1.89723284      0.04723628     -0.00993771     -0.00831431
+    10.0     -0.86685880    -26.00179392     -1.38458807     -1.39913472      0.00136531      0.02041813
+    10.0    -14.99514725     -9.73327401     -1.49412678      0.04580994      0.01096177      0.01022804
+    10.0      7.00887790      1.98168034      0.68812772      0.00896544     -0.00293511      0.00198547
+    10.0     14.82165676    -26.61468332     -0.63832974     -2.10322539     -0.00891726      0.01991691
+    10.0     36.97393038     41.34508248      3.24972457     -0.53759403     -0.01886630     -0.02264741
+    10.0     13.20164819     -5.94173158      0.74976608     -0.99205532     -0.00725503      0.00697320
+    10.0    -27.55525109     11.38230453     -0.82867230      2.04896832      0.02021279     -0.00334846
+    10.0     44.22611452      7.91205992      2.08170876     -1.97441862     -0.02553919     -0.00334242
+    10.0    -30.78228408     -9.00330845     -1.98277752      1.19492292      0.02083894      0.00999898
+    10.0     21.23162596      1.68817791      1.43493089     -0.91572699     -0.01244008      0.00145281
+    10.0     43.83049777     17.41111171      2.48943804     -1.60943360     -0.02478736     -0.00913389
+    10.0     18.27076095     14.11054567      1.82221570     -0.03605102     -0.01008131     -0.00688670
+    10.0    -23.16386718     14.98115804     -0.48627528      2.03701218      0.01725857     -0.00604352
+    10.0     17.66869644     37.69009924      2.68456831      0.61313519     -0.00829888     -0.02182563
+    10.0    -13.13453980     43.06229834      1.74152194      2.32880687      0.01088136     -0.02345547
+    10.0     17.04551969     -8.51968300      0.74199110     -1.36393081     -0.00992090      0.00843742
+    10.0    -12.74957582      2.86610039     -0.88706993      0.76014301      0.01004519      0.00183585
+    10.0    -11.57352997     -3.93218467     -1.08155095      0.15539312      0.00900597      0.00634724
+    10.0     -0.43691930     11.99128730      0.42464351      1.00896428      0.00223775     -0.00474195
+    10.0    -18.84718297      2.59155114     -1.14765946      1.09328119      0.01395275      0.00224813
+    10.0     26.50822037     34.91831202      2.84251996     -0.01459342     -0.01374681     -0.02010543
+    10.0     -1.83862732    -27.40591387     -1.51844281     -1.37417813      0.00190638      0.02119551
+    10.0    -29.61534814    -11.34773579     -2.05992588      1.01365241      0.02001716      0.01147311
+    10.0     -1.58282077      2.69811157     -0.11418406      0.29617314      0.00265977      0.00167764
+    10.0      2.81028701      8.79669118      0.52804717      0.69094215     -0.00005422     -0.00258329
+    10.0    -46.98701557     11.56383052     -1.07690408      2.84555950      0.02883999     -0.00259972
+    10.0     -3.40737443    -56.06838909     -2.91291405     -1.56839602      0.00150420      0.03217266
+    10.0    -19.98158539     39.46428514      1.28835283      2.57214878      0.01493065     -0.02105105
+    10.0    -44.66881930     12.46139603     -1.00158524      2.78765137      0.02804667     -0.00323063
+    10.0    -16.39650937     23.16371517      0.32747014      2.11248239      0.01323682     -0.01177621
+    10.0     21.95611509      7.76064067      1.72075828     -0.61228724     -0.01269236     -0.00269100
+    10.0    -10.50904475     12.60669705     -0.19243723      1.40501570      0.00897813     -0.00484325
+    10.0    -14.30586541     -0.91198946     -1.12740574      0.55739977      0.01090470      0.00440092
+    10.0    -46.00705467     -6.85206507     -2.04591400      2.14319881      0.02767905      0.00814089
+    10.0     30.41289215     -6.97966533      1.15654150     -1.91885498     -0.01852614      0.00680537
+    10.0    -48.27660341     27.60241976     -0.13762372      3.31622222      0.02879885     -0.01161224
+    10.0    -17.74747450     10.50189167     -0.63686673      1.56720699      0.01384037     -0.00328594
+    10.0     54.39641806     -0.37738366      1.72976962     -2.73607215     -0.02940059      0.00129876
+    10.0      6.47050061    -29.43922970     -1.20659479     -1.82090480     -0.00359394      0.02244751
+    10.0      0.58954963    -13.25292294     -0.49482500     -1.03808365      0.00082873      0.01218738
+    10.0    -12.31468078    -40.73604077     -2.60912850     -0.94516629      0.00720515      0.02765879
+    10.0     38.13312568     24.34484548      2.69648135     -1.04260079     -0.02152543     -0.01341969
+    10.0    -13.70564154     27.92937950      0.77625108      2.14221048      0.01158560     -0.01492998
+    10.0     40.53583366     -0.14911602      1.65704468     -2.10583120     -0.02408788      0.00179315
+    10.0      8.39984292    -15.41302717     -0.12676090     -1.44483730     -0.00437128      0.01330585
+    10.0     22.44930397    -38.06973908     -1.11496697     -2.59958621     -0.01287940      0.02515562
+    10.0     47.41809427      3.44198464      1.88610439     -2.29818650     -0.02696432     -0.00068958
+    10.0     27.36675414     46.97814868      3.25532655      0.14568231     -0.01291442     -0.02560627
+    10.0    -10.16897115    -22.40458265     -1.73420047     -0.76737649      0.00741932      0.01846132
+    10.0     40.36029012    -18.88517950      0.55513182     -2.79063722     -0.02344201      0.01302615
+    10.0    -14.39025584     20.54575351      0.21589623      1.94610689      0.01196694     -0.01021320
+    10.0     19.64156343     34.26658662      2.62377284      0.42861126     -0.00976569     -0.01997954
+    10.0    -33.50298072     43.14541702      1.10503992      3.09224158      0.02172220     -0.02121984
+    10.0    -20.79202850    -24.09713162     -2.28882549     -0.07479119      0.01364036      0.01919977
diff --git a/testsuite/tests/dph/nbody/dph-nbody-copy-opt.stdout b/testsuite/tests/dph/nbody/dph-nbody-copy-opt.stdout
new file mode 100644
index 0000000000..69fdd8b303
--- /dev/null
+++ b/testsuite/tests/dph/nbody/dph-nbody-copy-opt.stdout
@@ -0,0 +1,100 @@
+    10.0     -7.88876745     14.40403609      0.07781862      1.41725313      0.00728077     -0.00615418
+    10.0    -20.39602554     -5.40256368     -1.56824530      0.67893475      0.01493099      0.00782011
+    10.0     -0.05794753     10.34183386      0.35651327      0.89460951      0.00188899     -0.00356931
+    10.0     -4.75609397     34.74782948      1.61195437      1.87077953      0.00587195     -0.01975082
+    10.0     36.25896362     10.82337782      2.14170846     -1.41319743     -0.02163268     -0.00507727
+    10.0      4.02674361     -9.00872919      0.03617254     -0.88316283     -0.00122400      0.00926493
+    10.0     42.00406508    -40.85785845     -0.76014767     -3.29738763     -0.02191949      0.02332737
+    10.0    -22.63186030      5.80994447     -1.07420146      1.51160117      0.01670201      0.00006355
+    10.0     16.53870540     16.94639077      1.84926442      0.20378411     -0.00879785     -0.00880553
+    10.0     39.92854878     29.06425991      2.88523318     -1.01552251     -0.02189971     -0.01632925
+    10.0    -17.45501954     11.39301477     -0.56641470      1.60906365      0.01371008     -0.00396360
+    10.0     26.25934753      8.00486951      1.85024443     -0.89918952     -0.01562756     -0.00309898
+    10.0     -9.33900099      9.24549389     -0.36060159      1.12461927      0.00801307     -0.00255620
+    10.0    -46.47873679    -28.36980232     -2.92763912      1.44708065      0.02528654      0.01949016
+    10.0    -12.54370842     34.21722863      1.24120256      2.21072951      0.01080973     -0.01869097
+    10.0     -7.14048930      7.10420057     -0.36081624      0.86670872      0.00647863     -0.00118788
+    10.0    -49.88492485    -23.33817148     -2.76602163      1.78294227      0.02720067      0.01682362
+    10.0    -19.81399282     53.52954568      2.07232227      2.65936299      0.01424146     -0.02727658
+    10.0     23.77418551     14.68227128      2.04725863     -0.41772276     -0.01379116     -0.00752371
+    10.0     -5.73673778      8.93192786     -0.16259409      0.97138466      0.00562305     -0.00245174
+    10.0     10.54277542     -1.02674862      0.84834041     -0.44100517     -0.00531874      0.00383461
+    10.0     23.01197723     21.12299112      2.25990543     -0.12607295     -0.01291140     -0.01176114
+    10.0    -44.78532667     12.05197921     -1.02696812      2.77848076      0.02808850     -0.00298275
+    10.0     31.46388060    -49.75461307     -1.52046945     -3.03579919     -0.01637469      0.02786471
+    10.0     24.84943257    -25.92687211     -0.24060772     -2.45045466     -0.01484349      0.01860299
+    10.0     25.91948874    -30.60444211     -0.52684367     -2.60005186     -0.01516185      0.02084074
+    10.0    -10.85946929     20.87407647      0.39902427      1.82589346      0.00972306     -0.01062660
+    10.0    -38.51435867      1.59076858     -1.56374573      2.10935343      0.02533138      0.00325720
+    10.0     48.51766969    -21.77175738      0.49039776     -3.14884736     -0.02642908      0.01352300
+    10.0      5.74566172     46.44110258      2.61301762      1.41963745     -0.00049448     -0.02602402
+    10.0    -22.88917903    -27.97906439     -2.49898486     -0.03157484      0.01438842      0.02110301
+    10.0     31.73261776     -6.28614087      1.21728705     -1.94829313     -0.01955786      0.00624200
+    10.0      4.24232124     19.44671943      1.21964188      1.10199242     -0.00052277     -0.01009959
+    10.0      0.91334970     48.66777413      2.53737735      1.69247032      0.00244742     -0.02680742
+    10.0     10.67139892     31.69558668      2.17625638      0.97201541     -0.00424894     -0.01856619
+    10.0     12.94163719     58.29627746      3.27732262      1.10311871     -0.00411829     -0.03016643
+    10.0     39.19514702     34.09017661      3.04651632     -0.83806079     -0.02092181     -0.01899392
+    10.0    -24.13067759    -32.16302812     -2.68262548     -0.04506858      0.01454248      0.02301772
+    10.0     51.78333979    -13.45956325      1.00920828     -3.03719366     -0.02816357      0.00875884
+    10.0    -18.73188233    -17.30379387     -1.95701398     -0.00677590      0.01307052      0.01538889
+    10.0     24.70514705    -49.06503148     -1.67808526     -2.78661149     -0.01337746      0.02867654
+    10.0    -51.06940692    -15.61458174     -2.46357376      2.08982818      0.02835174      0.01252356
+    10.0     -4.29154911    -29.69366786     -1.77081329     -1.27717018      0.00330457      0.02241695
+    10.0      2.11752441     33.61609431      1.87012243      1.50451828      0.00141129     -0.01940596
+    10.0     37.73902003    -20.32722331      0.42253535     -2.74138534     -0.02210996      0.01412198
+    10.0     18.24940441     16.13909492      1.89723284      0.04723628     -0.00993771     -0.00831431
+    10.0     -0.86685880    -26.00179392     -1.38458807     -1.39913472      0.00136531      0.02041813
+    10.0    -14.99514725     -9.73327401     -1.49412678      0.04580994      0.01096177      0.01022804
+    10.0      7.00887790      1.98168034      0.68812772      0.00896544     -0.00293511      0.00198547
+    10.0     14.82165676    -26.61468332     -0.63832974     -2.10322539     -0.00891726      0.01991691
+    10.0     36.97393038     41.34508248      3.24972457     -0.53759403     -0.01886630     -0.02264741
+    10.0     13.20164819     -5.94173158      0.74976608     -0.99205532     -0.00725503      0.00697320
+    10.0    -27.55525109     11.38230453     -0.82867230      2.04896832      0.02021279     -0.00334846
+    10.0     44.22611452      7.91205992      2.08170876     -1.97441862     -0.02553919     -0.00334242
+    10.0    -30.78228408     -9.00330845     -1.98277752      1.19492292      0.02083894      0.00999898
+    10.0     21.23162596      1.68817791      1.43493089     -0.91572699     -0.01244008      0.00145281
+    10.0     43.83049777     17.41111171      2.48943804     -1.60943360     -0.02478736     -0.00913389
+    10.0     18.27076095     14.11054567      1.82221570     -0.03605102     -0.01008131     -0.00688670
+    10.0    -23.16386718     14.98115804     -0.48627528      2.03701218      0.01725857     -0.00604352
+    10.0     17.66869644     37.69009924      2.68456831      0.61313519     -0.00829888     -0.02182563
+    10.0    -13.13453980     43.06229834      1.74152194      2.32880687      0.01088136     -0.02345547
+    10.0     17.04551969     -8.51968300      0.74199110     -1.36393081     -0.00992090      0.00843742
+    10.0    -12.74957582      2.86610039     -0.88706993      0.76014301      0.01004519      0.00183585
+    10.0    -11.57352997     -3.93218467     -1.08155095      0.15539312      0.00900597      0.00634724
+    10.0     -0.43691930     11.99128730      0.42464351      1.00896428      0.00223775     -0.00474195
+    10.0    -18.84718297      2.59155114     -1.14765946      1.09328119      0.01395275      0.00224813
+    10.0     26.50822037     34.91831202      2.84251996     -0.01459342     -0.01374681     -0.02010543
+    10.0     -1.83862732    -27.40591387     -1.51844281     -1.37417813      0.00190638      0.02119551
+    10.0    -29.61534814    -11.34773579     -2.05992588      1.01365241      0.02001716      0.01147311
+    10.0     -1.58282077      2.69811157     -0.11418406      0.29617314      0.00265977      0.00167764
+    10.0      2.81028701      8.79669118      0.52804717      0.69094215     -0.00005422     -0.00258329
+    10.0    -46.98701557     11.56383052     -1.07690408      2.84555950      0.02883999     -0.00259972
+    10.0     -3.40737443    -56.06838909     -2.91291405     -1.56839602      0.00150420      0.03217266
+    10.0    -19.98158539     39.46428514      1.28835283      2.57214878      0.01493065     -0.02105105
+    10.0    -44.66881930     12.46139603     -1.00158524      2.78765137      0.02804667     -0.00323063
+    10.0    -16.39650937     23.16371517      0.32747014      2.11248239      0.01323682     -0.01177621
+    10.0     21.95611509      7.76064067      1.72075828     -0.61228724     -0.01269236     -0.00269100
+    10.0    -10.50904475     12.60669705     -0.19243723      1.40501570      0.00897813     -0.00484325
+    10.0    -14.30586541     -0.91198946     -1.12740574      0.55739977      0.01090470      0.00440092
+    10.0    -46.00705467     -6.85206507     -2.04591400      2.14319881      0.02767905      0.00814089
+    10.0     30.41289215     -6.97966533      1.15654150     -1.91885498     -0.01852614      0.00680537
+    10.0    -48.27660341     27.60241976     -0.13762372      3.31622222      0.02879885     -0.01161224
+    10.0    -17.74747450     10.50189167     -0.63686673      1.56720699      0.01384037     -0.00328594
+    10.0     54.39641806     -0.37738366      1.72976962     -2.73607215     -0.02940059      0.00129876
+    10.0      6.47050061    -29.43922970     -1.20659479     -1.82090480     -0.00359394      0.02244751
+    10.0      0.58954963    -13.25292294     -0.49482500     -1.03808365      0.00082873      0.01218738
+    10.0    -12.31468078    -40.73604077     -2.60912850     -0.94516629      0.00720515      0.02765879
+    10.0     38.13312568     24.34484548      2.69648135     -1.04260079     -0.02152543     -0.01341969
+    10.0    -13.70564154     27.92937950      0.77625108      2.14221048      0.01158560     -0.01492998
+    10.0     40.53583366     -0.14911602      1.65704468     -2.10583120     -0.02408788      0.00179315
+    10.0      8.39984292    -15.41302717     -0.12676090     -1.44483730     -0.00437128      0.01330585
+    10.0     22.44930397    -38.06973908     -1.11496697     -2.59958621     -0.01287940      0.02515562
+    10.0     47.41809427      3.44198464      1.88610439     -2.29818650     -0.02696432     -0.00068958
+    10.0     27.36675414     46.97814868      3.25532655      0.14568231     -0.01291442     -0.02560627
+    10.0    -10.16897115    -22.40458265     -1.73420047     -0.76737649      0.00741932      0.01846132
+    10.0     40.36029012    -18.88517950      0.55513182     -2.79063722     -0.02344201      0.01302615
+    10.0    -14.39025584     20.54575351      0.21589623      1.94610689      0.01196694     -0.01021320
+    10.0     19.64156343     34.26658662      2.62377284      0.42861126     -0.00976569     -0.01997954
+    10.0    -33.50298072     43.14541702      1.10503992      3.09224158      0.02172220     -0.02121984
+    10.0    -20.79202850    -24.09713162     -2.28882549     -0.07479119      0.01364036      0.01919977
diff --git a/testsuite/tests/dph/nbody/dph-nbody.T b/testsuite/tests/dph/nbody/dph-nbody.T
index 4edd3820bd..c250f2461f 100644
--- a/testsuite/tests/dph/nbody/dph-nbody.T
+++ b/testsuite/tests/dph/nbody/dph-nbody.T
@@ -17,7 +17,28 @@ test    ('dph-nbody-vseg-opt'
           , only_ways(['normal', 'threaded1', 'threaded2']) ] 
         , multimod_compile_and_run 
         , [ 'Main'
-          , '-Odph -fno-spec-constr -fno-liberate-case -package dph-lifted-vseg -package dph-prim-par'])
+          , '-Odph -fno-liberate-case -package dph-lifted-vseg -package dph-prim-par'])
+
+
+test    ('dph-nbody-copy-opt' 
+        , [ alone
+          , skip_if_fast
+          , extra_clean(['Main.hi',      'Main.o',
+                         'Body.hi',      'Body.o',
+                         'Config.hi',    'Config.o',
+                         'Dump.hi',      'Dump.o',
+                         'Solver.hi',    'Solver.o',
+                         'Util.hi',      'Util.o',
+                         'World.hi',     'World.o',
+                         'Types.hi',     'Types.o',
+                         'Generate.hi',  'Generate.o',
+                         'Randomish.hi', 'Randomish.o'])
+          , reqlib('dph-lifted-copy')
+          , reqlib('dph-prim-par')
+          , only_ways(['normal', 'threaded1', 'threaded2']) ] 
+        , multimod_compile_and_run 
+        , [ 'Main'
+          , '-Odph -fno-liberate-case -package dph-lifted-copy -package dph-prim-par'])
 
 
 test    ('dph-nbody-vseg-fast' 
@@ -38,3 +59,23 @@ test    ('dph-nbody-vseg-fast'
         , multimod_compile_and_run 
         , [ 'Main'
           , '-O0 -package dph-lifted-vseg -package dph-prim-par'])
+
+
+test    ('dph-nbody-copy-fast' 
+        , [ alone
+          , extra_clean(['Main.hi',      'Main.o',
+                         'Body.hi',      'Body.o',
+                         'Config.hi',    'Config.o',
+                         'Dump.hi',      'Dump.o',
+                         'Solver.hi',    'Solver.o',
+                         'Util.hi',      'Util.o',
+                         'World.hi',     'World.o',
+                         'Types.hi',     'Types.o',
+                         'Generate.hi',  'Generate.o',
+                         'Randomish.hi', 'Randomish.o'])
+          , reqlib('dph-lifted-copy')
+          , reqlib('dph-prim-par')
+          , only_ways(['normal', 'threaded1', 'threaded2']) ] 
+        , multimod_compile_and_run 
+        , [ 'Main'
+          , '-O0 -package dph-lifted-copy -package dph-prim-par'])