Merge branch 'aomp-dev' of https://github.com/ROCm-Developer-Tools/aomp…

… into aomp-dev
ROCm · Apr 12, 2023 · 5047503 · 5047503
2 parents 957bac7 + 878fbf5
commit 5047503
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 18 deletions.
diff --git a/bin/aomp_common_vars b/bin/aomp_common_vars
@@ -19,7 +19,7 @@ ROCM_VERSION=${ROCM_VERSION:-5.3.0}
 
 # Set the AOMP VERSION STRING
 AOMP_VERSION=${AOMP_VERSION:-"17.0"}
-AOMP_VERSION_MOD=${AOMP_VERSION_MOD:-"1"}
+AOMP_VERSION_MOD=${AOMP_VERSION_MOD:-"2"}
 AOMP_VERSION_STRING=${AOMP_VERSION_STRING:-"$AOMP_VERSION-$AOMP_VERSION_MOD"}
 export AOMP_VERSION_STRING AOMP_VERSION AOMP_VERSION_MOD ROCM_VERSION
 

diff --git a/bin/check_sollve.sh b/bin/check_sollve.sh
@@ -89,7 +89,7 @@ done
 # This log combines all pass/fails from various openmp versions into one file.
 # Each test is prefixed with openmp version for clarity.
 if [ "$1" == "log" ]; then
-  date=`date '+%Y-%m-%d'`
+  date=${BLOG_DATE:-`date '+%Y-%m-%d'`}
   base_dir=$AOMP_REPOS_TEST/$AOMP_SOLVV_REPO_NAME
   cd $base_dir
 

diff --git a/bin/run_ovo.sh b/bin/run_ovo.sh
@@ -31,7 +31,7 @@ export MAKEFLAGS=-j$HALF_THREADS
 ./ovo.sh run
 ./ovo.sh report --summary
 
-date=`date '+%Y-%m-%d'`
+date=${BLOG_DATE:-`date '+%Y-%m-%d'`}
 if [ "$1" == "log" ]; then
   if [ "$2" != "" ]; then
     prefix=$2

diff --git a/bin/spec-configs/hpc2021/amdgpu_clang.cfg b/bin/spec-configs/hpc2021/amdgpu_clang.cfg
@@ -68,7 +68,7 @@ FC_VERSION_OPTION  = --version
 
 #preENV_OMP_PROC_BIND=true
 MPIRUN_OPTS = --bind-to none #socket # core
-submit = timeout 20m  mpirun ${MPIRUN_OPTS} -np $ranks gpurun -s $command
+submit = timeout -s 9 20m  mpirun ${MPIRUN_OPTS} -np $ranks gpurun -s $command
 
 #######################################################################
 
@@ -103,7 +103,7 @@ PORTABILITY_LIBS = -lm
   #submit = mpirun ${MPIRUN_OPTS} -np $ranks gpurun -s strace -t -e trace=%memory  $command
   #submit = mpirun ${MPIRUN_OPTS} -np $ranks $command
   #submit = timeout 20m mpirun ${MPIRUN_OPTS} -np $ranks  $command
-  submit = timeout 20m mpirun ${MPIRUN_OPTS} -np $ranks gpurun -s $command
+  submit = timeout -s 9 20m mpirun ${MPIRUN_OPTS} -np $ranks gpurun -s $command
   OPTIMIZE += -fopenmp -fopenmp-targets=amdgcn-amd-amdhsa -Xopenmp-target=amdgcn-amd-amdhsa -march=%{gputype}
   OPTIMIZE += -fopenmp-target-xteam-reduction-blocksize=128
 #  OPTIMIZE += -mcode-object-version=5
@@ -135,4 +135,3 @@ PORTABILITY_LIBS = -lm
 default=peak=default:
 basepeak=1
 
-__HASH__
diff --git a/bin/spec-configs/hpc2021/rocm-5.4/amdgpu_clang.cfg b/bin/spec-configs/hpc2021/rocm-5.4/amdgpu_clang.cfg
@@ -68,7 +68,7 @@ FC_VERSION_OPTION  = --version
 
 #preENV_OMP_PROC_BIND=true
 MPIRUN_OPTS = --bind-to none #socket # core
-submit = mpirun ${MPIRUN_OPTS} -np $ranks gpurun $command
+submit = timeout 20m  mpirun ${MPIRUN_OPTS} -np $ranks gpurun -s $command
 
 #######################################################################
 
@@ -102,15 +102,20 @@ PORTABILITY_LIBS = -lm
   #submit = mpirun ${MPIRUN_OPTS} -np $ranks $command
   #submit = mpirun ${MPIRUN_OPTS} -np $ranks gpurun -s strace -t -e trace=%memory  $command
   #submit = mpirun ${MPIRUN_OPTS} -np $ranks $command
-  submit = mpirun ${MPIRUN_OPTS} -np $ranks gpurun -s $command
+  #submit = timeout 20m mpirun ${MPIRUN_OPTS} -np $ranks  $command
+  submit = timeout -s 9 20m mpirun ${MPIRUN_OPTS} -np $ranks gpurun -s $command
   OPTIMIZE += -fopenmp -fopenmp-targets=amdgcn-amd-amdhsa -Xopenmp-target=amdgcn-amd-amdhsa -march=%{gputype}
+#  OPTIMIZE += -mcode-object-version=5
 
-  505.lbm_t:
+  505.lbm_t,605.lbm_s,705.lbm_m,805.lbm_l:
     OPTIMIZE += -fno-openmp-target-ignore-env-vars
   513.soma_t,613.soma_s:
     PORTABILITY += -DSPEC_NO_VAR_ARRAY_REDUCE
-  519.clvleaf_t:
-    FOPTIMIZE += -Mx,201,2 # workaround for map copy issue
+  519.clvleaf_t,619.clvleaf_s,719.clvleaf_m,819.clvleaf_l:
+     FOPTIMIZE += -Mx,201,2 # workaround for map copy issue
+   # FOPTIMIZE += -Mx,234,100 # 
+  534.hpgmgfv_t:
+    COPTIMIZE +=  -fno-openmp-assume-no-nested-parallelism
 
 %endif
 

diff --git a/bin/spec-configs/hpc2021/rocm-5.5/amdgpu_clang.cfg b/bin/spec-configs/hpc2021/rocm-5.5/amdgpu_clang.cfg
@@ -68,7 +68,7 @@ FC_VERSION_OPTION  = --version
 
 #preENV_OMP_PROC_BIND=true
 MPIRUN_OPTS = --bind-to none #socket # core
-submit = mpirun ${MPIRUN_OPTS} -np $ranks gpurun $command
+submit = timeout -s 9 20m  mpirun ${MPIRUN_OPTS} -np $ranks gpurun -s $command
 
 #######################################################################
 
@@ -102,16 +102,21 @@ PORTABILITY_LIBS = -lm
   #submit = mpirun ${MPIRUN_OPTS} -np $ranks $command
   #submit = mpirun ${MPIRUN_OPTS} -np $ranks gpurun -s strace -t -e trace=%memory  $command
   #submit = mpirun ${MPIRUN_OPTS} -np $ranks $command
-  submit = mpirun ${MPIRUN_OPTS} -np $ranks gpurun -s $command
+  #submit = timeout 20m mpirun ${MPIRUN_OPTS} -np $ranks  $command
+  submit = timeout  -s 9 20m mpirun ${MPIRUN_OPTS} -np $ranks gpurun -s $command
   OPTIMIZE += -fopenmp -fopenmp-targets=amdgcn-amd-amdhsa -Xopenmp-target=amdgcn-amd-amdhsa -march=%{gputype}
-  OPTIMIZE += -fopenmp-target-xteam-reduction-blocksize=128
+  OPTIMIZE += -fopenmp-target-xteam-reduction-blocksize=128
+#  OPTIMIZE += -mcode-object-version=5
 
-  505.lbm_t:
+  505.lbm_t,605.lbm_s,705.lbm_m,805.lbm_l:
     OPTIMIZE += -fno-openmp-target-ignore-env-vars
   513.soma_t,613.soma_s:
     PORTABILITY += -DSPEC_NO_VAR_ARRAY_REDUCE
-  519.clvleaf_t:
-    FOPTIMIZE += -Mx,201,2 # workaround for map copy issue
+  519.clvleaf_t,619.clvleaf_s,719.clvleaf_m,819.clvleaf_l:
+     FOPTIMIZE += -Mx,201,2 # workaround for map copy issue
+   # FOPTIMIZE += -Mx,234,100 # 
+  534.hpgmgfv_t:
+ #   COPTIMIZE +=  -fno-openmp-assume-no-nested-parallelism
 
 %endif
 

diff --git a/test/LLNL/openmp5.0-tests/check_LLNL.sh b/test/LLNL/openmp5.0-tests/check_LLNL.sh
@@ -22,7 +22,7 @@ AOMP_GPU=${AOMP_GPU:-`$AOMP/bin/mygpu`}
 export AOMP AOMP_GPU
 echo AOMP_GPU = $AOMP_GPU
 echo AOMP = $AOMP
-date=`date '+%Y-%m-%d'`
+date=${BLOG_DATE:-`date '+%Y-%m-%d'`}
 if [ "$1" == "log" ]; then
   if [ "$2" != "" ]; then
     prefix=$2

diff --git a/test/smoke/managed_memory/Makefile b/test/smoke/managed_memory/Makefile
@@ -8,6 +8,7 @@ TESTSRC_ALL  = $(TESTSRC_MAIN) $(TESTSRC_AUX)
 CLANG        ?= clang++
 OMP_BIN      = $(AOMP)/bin/$(CLANG)
 CC           = $(OMP_BIN) $(VERBOSE)
+RUNENV       = HSA_XNACK=1
 #-ccc-print-phases
 #"-\#\#\#"
 

diff --git a/test/smoke/managed_memory/managed_memory.cpp b/test/smoke/managed_memory/managed_memory.cpp
@@ -15,6 +15,13 @@ int check_res(double * v, int n) {
   return err;
 }
 
+#ifndef __OFFLOAD_ARCH_gfx90a__
+int main() {
+  printf("This test only works on multi-device MI200 systems (gfx90a).\n");
+  printf("Existing with pass\n");
+  return 0;
+}
+#else
 int main() {
   int max_devs = omp_get_num_devices();
 
@@ -79,3 +86,4 @@ int main() {
 
   return err;
 }
+#endif