Oops, I had promotion case wrong in this test...

test/distributions/robust/arithmetic/PREDIFF

@@ -23,7 +23,7 @@ else:
     # get the distribution from the -sdistType=... option, if present
     dist = 'block'
     searchstring='distType=DistType.'
-    s = string.rfind(compopts, searchstring)
+    s = compopts.rfind(searchstring)
 
     if s != -1:
         opt = compopts[s+len(searchstring):len(compopts)]
@@ -40,5 +40,5 @@ if not os.path.isfile(goodfn):
         if not os.path.isfile(goodfn):
             goodfn=testname+'.default.good'
 
-print "cp", goodfn, targetfn
+print('cp {0} {1}'.format(goodfn, targetfn))
 shutil.copy(goodfn, targetfn)

test/distributions/robust/arithmetic/performance/multilocale/sliceOps.block.good

@@ -10,8 +10,10 @@ use slice as leader (module-scope):
 (execute_on_nb = 3) (<no communication>) (<no communication>) (<no communication>)
 use slice as follower (module-scope):
 (execute_on_nb = 3) (<no communication>) (<no communication>) (<no communication>)
-promotion (module-scope):
-(execute_on_nb = 3) (get = 115) (get = 115) (get = 201)
+1-arg promotion (module-scope):
+(execute_on_nb = 3) (<no communication>) (<no communication>) (<no communication>)
+2-arg promotion (module-scope):
+(execute_on_nb = 3) (<no communication>) (<no communication>) (<no communication>)
 create slice (local-scope):
 (execute_on = 2) (execute_on = 1) (<no communication>) (<no communication>)
 use slice via assignment (local-scope):
@@ -24,5 +26,7 @@ use slice as leader (local-scope):
 (execute_on_nb = 3) (<no communication>) (<no communication>) (<no communication>)
 use slice as follower (local-scope):
 (execute_on_nb = 3) (<no communication>) (<no communication>) (<no communication>)
-promotion (local-scope):
-(execute_on_nb = 3) (get = 115) (get = 115) (get = 201)
+1-arg promotion (local-scope):
+(execute_on_nb = 3) (<no communication>) (<no communication>) (<no communication>)
+2-arg promotion (local-scope):
+(execute_on_nb = 3) (<no communication>) (<no communication>) (<no communication>)

test/distributions/robust/arithmetic/performance/multilocale/sliceOps.block.na-none.good

@@ -10,8 +10,10 @@ use slice as leader (module-scope):
 (execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
 use slice as follower (module-scope):
 (execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
-promotion (module-scope):
-(execute_on_nb = 3) (get = 115, execute_on_fast = 1) (get = 115, execute_on_fast = 1) (get = 201, execute_on_fast = 1)
+1-arg promotion (module-scope):
+(execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
+2-arg promotion (module-scope):
+(execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
 create slice (local-scope):
 (execute_on = 2) (execute_on = 1) (<no communication>) (<no communication>)
 use slice via assignment (local-scope):
@@ -24,5 +26,7 @@ use slice as leader (local-scope):
 (execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
 use slice as follower (local-scope):
 (execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
-promotion (local-scope):
-(execute_on_nb = 3) (get = 115, execute_on_fast = 1) (get = 115, execute_on_fast = 1) (get = 201, execute_on_fast = 1)
+1-arg promotion (local-scope):
+(execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
+2-arg promotion (local-scope):
+(execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)

test/distributions/robust/arithmetic/performance/multilocale/sliceOps.chpl

@@ -35,8 +35,12 @@ forall (b,a) in zip(B,AS) do
 stopTrial(B, "use slice as follower (module-scope)");
 
 startTrial();
-foo(B, A);
-stopTrial(B, "promotion (module-scope)");
+foo(AS);
+stopTrial(B, "1-arg promotion (module-scope)");
+
+startTrial();
+bar(B, AS);
+stopTrial(B, "2-arg promotion (module-scope)");
 
 proc main() {
   const bigDom4D = Dom4D.expand((1,1,1,1));
@@ -72,9 +76,12 @@ proc main() {
   stopTrial(B, "use slice as follower (local-scope)");
 
   startTrial();
-  foo(B, A);
-  stopTrial(B, "promotion (local-scope)");
-
+  foo(AS);
+  stopTrial(B, "1-arg promotion (local-scope)");
+
+  startTrial();
+  bar(B, AS);
+  stopTrial(B, "2-arg promotion (local-scope)");
 }
 
 proc startTrial() {
@@ -92,6 +99,9 @@ proc stopTrial(B, str, skipVerify=true) {
   B = (0,0,0,0);
 }  
 
-proc foo(ref b: B.eltType, a: A.eltType) {
+proc foo(a: A.eltType) {
+}
+
+proc bar(ref b: B.eltType, a: A.eltType) {
   b = a;
 }

test/distributions/robust/arithmetic/performance/multilocale/sliceOps.cyclic.good

@@ -10,8 +10,10 @@ use slice as leader (module-scope):
 (execute_on_nb = 3) (<no communication>) (<no communication>) (<no communication>)
 use slice as follower (module-scope):
 (execute_on_nb = 3) (<no communication>) (<no communication>) (<no communication>)
-promotion (module-scope):
-(get = 331, execute_on_nb = 3) (get = 331) (get = 331) (get = 331)
+1-arg promotion (module-scope):
+(execute_on_nb = 3) (<no communication>) (<no communication>) (<no communication>)
+2-arg promotion (module-scope):
+(execute_on_nb = 3) (<no communication>) (<no communication>) (<no communication>)
 create slice (local-scope):
 (execute_on = 2) (execute_on = 1) (<no communication>) (<no communication>)
 use slice via assignment (local-scope):
@@ -24,5 +26,7 @@ use slice as leader (local-scope):
 (execute_on_nb = 3) (<no communication>) (<no communication>) (<no communication>)
 use slice as follower (local-scope):
 (execute_on_nb = 3) (<no communication>) (<no communication>) (<no communication>)
-promotion (local-scope):
-(get = 331, execute_on_nb = 3) (get = 331) (get = 331) (get = 331)
+1-arg promotion (local-scope):
+(execute_on_nb = 3) (<no communication>) (<no communication>) (<no communication>)
+2-arg promotion (local-scope):
+(execute_on_nb = 3) (<no communication>) (<no communication>) (<no communication>)

test/distributions/robust/arithmetic/performance/multilocale/sliceOps.cyclic.na-none.good

@@ -10,8 +10,10 @@ use slice as leader (module-scope):
 (execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
 use slice as follower (module-scope):
 (execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
-promotion (module-scope):
-(get = 331, execute_on_nb = 3) (get = 331, execute_on_fast = 1) (get = 331, execute_on_fast = 1) (get = 331, execute_on_fast = 1)
+1-arg promotion (module-scope):
+(execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
+2-arg promotion (module-scope):
+(execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
 create slice (local-scope):
 (execute_on = 2) (execute_on = 1) (<no communication>) (<no communication>)
 use slice via assignment (local-scope):
@@ -24,5 +26,7 @@ use slice as leader (local-scope):
 (execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
 use slice as follower (local-scope):
 (execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
-promotion (local-scope):
-(get = 331, execute_on_nb = 3) (get = 331, execute_on_fast = 1) (get = 331, execute_on_fast = 1) (get = 331, execute_on_fast = 1)
+1-arg promotion (local-scope):
+(execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
+2-arg promotion (local-scope):
+(execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)

test/distributions/robust/arithmetic/performance/multilocale/sliceOps.default.good

@@ -1,28 +1,32 @@
 create slice (module-scope):
-(execute_on = 2) (execute_on = 1) (<no communication>) (<no communication>)
+(<no communication>)
 use slice via assignment (module-scope):
-(execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
+(<no communication>)
 use slice via random access (module-scope):
-(execute_on_nb = 3) (get = 648, execute_on_fast = 1) (get = 648, execute_on_fast = 1) (get = 648, execute_on_fast = 1)
+(<no communication>)
 use slice as standalone (module-scope):
-(execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
+(<no communication>)
 use slice as leader (module-scope):
-(execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
+(<no communication>)
 use slice as follower (module-scope):
-(execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
-promotion (module-scope):
-(execute_on_nb = 3) (get = 115, execute_on_fast = 1) (get = 115, execute_on_fast = 1) (get = 201, execute_on_fast = 1)
+(<no communication>)
+1-arg promotion (module-scope):
+(<no communication>)
+2-arg promotion (module-scope):
+(<no communication>)
 create slice (local-scope):
-(execute_on = 2) (execute_on = 1) (<no communication>) (<no communication>)
+(<no communication>)
 use slice via assignment (local-scope):
-(execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
+(<no communication>)
 use slice via random access (local-scope):
-(execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
+(<no communication>)
 use slice as standalone (local-scope):
-(execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
+(<no communication>)
 use slice as leader (local-scope):
-(execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
+(<no communication>)
 use slice as follower (local-scope):
-(execute_on_nb = 3) (execute_on_fast = 1) (execute_on_fast = 1) (execute_on_fast = 1)
-promotion (local-scope):
-(execute_on_nb = 3) (get = 115, execute_on_fast = 1) (get = 115, execute_on_fast = 1) (get = 201, execute_on_fast = 1)
+(<no communication>)
+1-arg promotion (local-scope):
+(<no communication>)
+2-arg promotion (local-scope):
+(<no communication>)

test/distributions/robust/arithmetic/performance/multilocale/sliceOps.replicated.good

@@ -10,7 +10,9 @@ use slice as leader (module-scope):
 (<no communication>) (<no communication>) (<no communication>) (<no communication>)
 use slice as follower (module-scope):
 (<no communication>) (<no communication>) (<no communication>) (<no communication>)
-promotion (module-scope):
+1-arg promotion (module-scope):
+(<no communication>) (<no communication>) (<no communication>) (<no communication>)
+2-arg promotion (module-scope):
 (<no communication>) (<no communication>) (<no communication>) (<no communication>)
 create slice (local-scope):
 (execute_on = 2) (execute_on = 1) (<no communication>) (<no communication>)
@@ -24,5 +26,7 @@ use slice as leader (local-scope):
 (<no communication>) (<no communication>) (<no communication>) (<no communication>)
 use slice as follower (local-scope):
 (<no communication>) (<no communication>) (<no communication>) (<no communication>)
-promotion (local-scope):
+1-arg promotion (local-scope):
+(<no communication>) (<no communication>) (<no communication>) (<no communication>)
+2-arg promotion (local-scope):
 (<no communication>) (<no communication>) (<no communication>) (<no communication>)