diff --git a/test/studies/lcals/LCALSConfiguration.chpl b/test/studies/lcals/LCALSConfiguration.chpl index 9bc294cea7c2..3f44ffab8d73 100644 --- a/test/studies/lcals/LCALSConfiguration.chpl +++ b/test/studies/lcals/LCALSConfiguration.chpl @@ -80,7 +80,7 @@ module LCALSConfiguration { config const run_variantRawSPMD = false; // off by default because // short and medium loops // take too long. - config const run_variantRawVectorizeOnly = false; // off by default because + config const run_variantRawVector = false; // off by default because // it currently behaves // identically to the // serial variant diff --git a/test/studies/lcals/LCALSMain.chpl b/test/studies/lcals/LCALSMain.chpl index a07e4eda30f1..b176f79aa3c7 100644 --- a/test/studies/lcals/LCALSMain.chpl +++ b/test/studies/lcals/LCALSMain.chpl @@ -12,7 +12,7 @@ use RunBRawLoops; use RunCRawLoops; use RunParallelRawLoops; use RunSPMDRawLoops; -use RunVectorizeOnlyRawLoops; +use RunVectorRawLoops; use IO; @@ -118,7 +118,7 @@ proc main { } run_variants[LoopVariantID.RAW_SPMD] = true; } - if run_variantRawVectorizeOnly then + if run_variantRawVector then run_variants[LoopVariantID.RAW_VECTOR_ONLY] = true; @@ -617,7 +617,7 @@ proc runLoopVariant(lvid: LoopVariantID, run_loop:[] bool, ilength: LoopLength) runSPMDRawLoops(loop_stats, run_loop, ilength); } when LoopVariantID.RAW_VECTOR_ONLY { - runVectorizeOnlyRawLoops(loop_stats, run_loop, ilength); + runVectorRawLoops(loop_stats, run_loop, ilength); } /* when LoopVariantID.FORALL_LAMBDA { diff --git a/test/studies/lcals/LCALSMain.good b/test/studies/lcals/LCALSMain.good index 6a06e95261c6..c7b254ba01ae 100644 --- a/test/studies/lcals/LCALSMain.good +++ b/test/studies/lcals/LCALSMain.good @@ -1,4 +1,3 @@ -RunVectorizeOnlyRawLoops.chpl:4: warning: The 'VectorizingIterator' module has been deprecated; please use 'foreach' loops instead allocateLoopSuiteRunInfo... diff --git a/test/studies/lcals/RunVectorizeOnlyRawLoops.chpl b/test/studies/lcals/RunVectorRawLoops.chpl similarity index 98% rename from test/studies/lcals/RunVectorizeOnlyRawLoops.chpl rename to test/studies/lcals/RunVectorRawLoops.chpl index f59197739ae3..c60fa2cb8c6e 100644 --- a/test/studies/lcals/RunVectorizeOnlyRawLoops.chpl +++ b/test/studies/lcals/RunVectorRawLoops.chpl @@ -1,10 +1,9 @@ -module RunVectorizeOnlyRawLoops { +module RunVectorRawLoops { use LCALSDataTypes; use Timer; - use VectorizingIterator; private use Math; - proc runVectorizeOnlyRawLoops(loop_stats: [] shared LoopStat, run_loop:[] bool, ilength: LoopLength) { + proc runVectorRawLoops(loop_stats: [] shared LoopStat, run_loop:[] bool, ilength: LoopLength) { var loop_suite_run_info = getLoopSuiteRunInfo(); var loop_data = getLoopData(); @@ -471,7 +470,8 @@ module RunVectorizeOnlyRawLoops { var val = 0.0; ltimer.start(); for 0..#num_samples { - forall i in vectorizeOnly(0..(len-1):int(32)) with (+ reduce sumx) { + // TODO: this should have a reduce intent instead of a ref intent + foreach i in 0..(len-1):int(32) with (ref sumx) { var x = x0 + i*h; sumx += trap_int_func(x, y, xp, yp); } diff --git a/test/studies/lcals/RunVectorizeOnlyRawLoops.notest b/test/studies/lcals/RunVectorRawLoops.notest similarity index 100% rename from test/studies/lcals/RunVectorizeOnlyRawLoops.notest rename to test/studies/lcals/RunVectorRawLoops.notest