Renew CI specs per LLNL/radiuss-shared-ci#15

.gitlab-ci.yml

@@ -58,7 +58,7 @@ stages:
     include:
       - local: '.gitlab/custom-jobs-and-variables.yml'
       - project: 'radiuss/radiuss-shared-ci'
-        ref: main
+        ref: woptim/specs-renewal
         file: '${CI_MACHINE}-build-and-test.yml'
       - local: '.gitlab/${CI_MACHINE}-build-and-test-extra.yml'
     strategy: depend
@@ -84,7 +84,7 @@ trigger-rajaperf:
 include:
   # checks preliminary to running the actual CI test (optional)
   - project: 'radiuss/radiuss-shared-ci'
-    ref: main
+    ref: woptim/specs-renewal
     file: 'preliminary-ignore-draft-pr.yml'
   # pipelines subscribed by the project
   - local: '.gitlab/subscribed-pipelines.yml'

.gitlab/corona-build-and-test-extra.yml

@@ -21,8 +21,8 @@
 # ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
 # describe the spec here.
 
-rocm_5_1_1_clang_13_0_0_desul_atomics:
+rocm_5_4_1_clang_15_0_0_desul_atomics:
   variables:
-    SPEC: " ~shared +rocm ~openmp +tests +desul amdgpu_target=gfx906 %clang@13.0.0 ^hip@5.1.1 ^blt@develop"
+    SPEC: " ~shared +rocm ~openmp +tests +desul amdgpu_target=gfx906 %clang@15.0.0 ^hip@5.4.1 ^blt@develop"
   extends: .build_and_test_on_corona
 

.gitlab/custom-jobs-and-variables.yml

@@ -47,7 +47,7 @@ variables:
 # Arguments for job level allocation
   LASSEN_BUILD_AND_TEST_JOB_ALLOC: "1 -W 60"
 # Project specific variants for lassen
-  PROJECT_LASSEN_VARIANTS: "~shared +openmp +tests"
+  PROJECT_LASSEN_VARIANTS: "~shared +openmp +tests cuda_arch=70"
 # Project specific deps for lassen
   PROJECT_LASSEN_DEPS: ""
 

.gitlab/lassen-build-and-test-extra.yml

@@ -12,93 +12,107 @@
 # We keep ${PROJECT_<MACHINE>_VARIANTS} and ${PROJECT_<MACHINE>_DEPS} So that
 # the comparison with the original job is easier.
 
-# Overriding shared spec: Allow failures
-ibm_clang_9_0_0:
-  variables:
-    SPEC: " ${PROJECT_LASSEN_VARIANTS} %clang@ibm.9.0.0 ${PROJECT_LASSEN_DEPS}"
-  extends: .build_and_test_on_lassen
-  allow_failure: true
-
-# Overriding shared spec: Allow failures
-ibm_clang_9_0_0_gcc_8_3_1:
-  variables:
-    SPEC: " ${PROJECT_LASSEN_VARIANTS} %clang@ibm.9.0.0 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ${PROJECT_LASSEN_DEPS}"
-  extends: .build_and_test_on_lassen
-  allow_failure: true
-
-# Overriding shared spec: Extra flags
-gcc_8_3_1:
-  variables:
-    SPEC: " ${PROJECT_LASSEN_VARIANTS} %gcc@8.3.1 cxxflags==\"-finline-functions -finline-limit=20000\" cflags==\"-finline-functions -finline-limit=20000\" ${PROJECT_LASSEN_DEPS}"
-  extends: .build_and_test_on_lassen
-
-# Overriding shared spec: Longer allocation + Allow failures
-pgi_20_4_gcc_8_3_1:
-  extends: .build_and_test_on_lassen
-  variables:
-    SPEC: " ${PROJECT_LASSEN_VARIANTS} %pgi@20.4 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ${PROJECT_LASSEN_DEPS}"
-    LASSEN_BUILD_AND_TEST_JOB_ALLOC: "1 -W 80"
-  allow_failure: true
-
-# Overriding shared spec: Extra flags
-xl_16_1_1_12:
-  variables:
-    SPEC: " ${PROJECT_LASSEN_VARIANTS} %xl@16.1.1.12 cxxflags==\"-qthreaded -std=c++14 -O3 -qstrict -qxlcompatmacros -qlanglvl=extended0x -qalias=noansi -qhot -qpic -qsmp=omp -qsuppress=1500-029 -qsuppress=1500-036\" ${PROJECT_LASSEN_DEPS}"
-  extends: .build_and_test_on_lassen
-
-# Overriding shared spec: Extra flags
-xl_16_1_1_12_gcc_8_3_1:
-  variables:
-    SPEC: " ${PROJECT_LASSEN_VARIANTS} %xl@16.1.1.12 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 -qthreaded -std=c++14 -O3 -qstrict -qxlcompatmacros -qlanglvl=extended0x -qalias=noansi -qhot -qpic -qsmp=omp -qsuppress=1500-029 -qsuppress=1500-036\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ${PROJECT_LASSEN_DEPS}"
-  extends: .build_and_test_on_lassen
-
-# Overriding shared spec: Allow failures
-ibm_clang_9_0_0_gcc_8_3_1_cuda_10_1_168:
-  extends: .build_and_test_on_lassen
-  variables:
-    SPEC: " ${PROJECT_LASSEN_VARIANTS} +cuda %clang@ibm.9.0.0 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ^cuda@10.1.168 ${PROJECT_LASSEN_DEPS}"
-  allow_failure: true
-
-# Overriding shared spec: Longer allocation + Extra flags + Allow failure + Updated cuda
-xl_16_1_1_12_cuda_11_1_1:
-  variables:
-    SPEC: " ${PROJECT_LASSEN_VARIANTS} +cuda %xl@16.1.1.12 cxxflags==\"-qthreaded -std=c++14 -O3 -qstrict -qxlcompatmacros -qlanglvl=extended0x -qalias=noansi -qhot -qpic -qsmp=omp -qsuppress=1500-029 -qsuppress=1500-036\" cuda_arch=70 ^cuda@11.1.0 ${PROJECT_LASSEN_DEPS}"
+##  # Overriding shared spec: Allow failures
+##  ibm_clang_9_0_0:
+##    variables:
+##      SPEC: " ${PROJECT_LASSEN_VARIANTS} %clang@ibm.9.0.0 ${PROJECT_LASSEN_DEPS}"
+##    extends: .build_and_test_on_lassen
+##    allow_failure: true
+##  
+##  # Overriding shared spec: Allow failures
+##  ibm_clang_9_0_0_gcc_8_3_1:
+##    variables:
+##      SPEC: " ${PROJECT_LASSEN_VARIANTS} %clang@ibm.9.0.0 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ${PROJECT_LASSEN_DEPS}"
+##    extends: .build_and_test_on_lassen
+##    allow_failure: true
+##  
+##  # Overriding shared spec: Extra flags
+##  gcc_8_3_1:
+##    variables:
+##      SPEC: " ${PROJECT_LASSEN_VARIANTS} %gcc@8.3.1 cxxflags==\"-finline-functions -finline-limit=20000\" cflags==\"-finline-functions -finline-limit=20000\" ${PROJECT_LASSEN_DEPS}"
+##    extends: .build_and_test_on_lassen
+##  
+##  # Overriding shared spec: Longer allocation + Allow failures
+##  pgi_20_4_gcc_8_3_1:
+##    extends: .build_and_test_on_lassen
+##    variables:
+##      SPEC: " ${PROJECT_LASSEN_VARIANTS} %pgi@20.4 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ${PROJECT_LASSEN_DEPS}"
+##      LASSEN_BUILD_AND_TEST_JOB_ALLOC: "1 -W 80"
+##    allow_failure: true
+##  
+##  # Overriding shared spec: Extra flags
+##  xl_16_1_1_12:
+##    variables:
+##      SPEC: " ${PROJECT_LASSEN_VARIANTS} %xl@16.1.1.12 cxxflags==\"-qthreaded -std=c++14 -O3 -qstrict -qxlcompatmacros -qlanglvl=extended0x -qalias=noansi -qhot -qpic -qsmp=omp -qsuppress=1500-029 -qsuppress=1500-036\" ${PROJECT_LASSEN_DEPS}"
+##    extends: .build_and_test_on_lassen
+##  
+##  # Overriding shared spec: Extra flags
+##  xl_16_1_1_12_gcc_8_3_1:
+##    variables:
+##      SPEC: " ${PROJECT_LASSEN_VARIANTS} %xl@16.1.1.12 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 -qthreaded -std=c++14 -O3 -qstrict -qxlcompatmacros -qlanglvl=extended0x -qalias=noansi -qhot -qpic -qsmp=omp -qsuppress=1500-029 -qsuppress=1500-036\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ${PROJECT_LASSEN_DEPS}"
+##    extends: .build_and_test_on_lassen
+##  
+##  # Overriding shared spec: Allow failures
+##  ibm_clang_9_0_0_gcc_8_3_1_cuda_10_1_168:
+##    extends: .build_and_test_on_lassen
+##    variables:
+##      SPEC: " ${PROJECT_LASSEN_VARIANTS} +cuda %clang@ibm.9.0.0 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ^cuda@10.1.168 ${PROJECT_LASSEN_DEPS}"
+##    allow_failure: true
+##  
+##  # Overriding shared spec: Longer allocation + Extra flags + Allow failure + Updated cuda
+##  xl_16_1_1_12_cuda_11_1_1:
+##    variables:
+##      SPEC: " ${PROJECT_LASSEN_VARIANTS} +cuda %xl@16.1.1.12 cxxflags==\"-qthreaded -std=c++14 -O3 -qstrict -qxlcompatmacros -qlanglvl=extended0x -qalias=noansi -qhot -qpic -qsmp=omp -qsuppress=1500-029 -qsuppress=1500-036\" cuda_arch=70 ^cuda@11.1.0 ${PROJECT_LASSEN_DEPS}"
+##      LASSEN_BUILD_AND_TEST_JOB_ALLOC: "1 -W 120"
+##    allow_failure: true
+##    extends: .build_and_test_on_lassen
+##  
+##  # Overriding shared spec: Deactivated spec. This spec will be removed soon.
+##  xl_16_1_1_12_gcc_7_3_1_cuda_10_1_168:
+##    variables:
+##      SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %xl@16.1.1.12 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-7.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-7.3.1\" ^cuda@10.1.168 ${PROJECT_LASSEN_DEPS}"
+##    extends: .build_and_test_on_lassen
+##    script:
+##      - |
+##        echo -e "\e[31mDeactivated spec !\e[0m"
+##        echo -e "\e[31m${SPEC}\e[0m"
+##        echo -e "\e[31mRAJA won’t build with Cuda < 11.1.0 due to a known issue.\e[0m"
+##      - exit 1
+##    allow_failure: true
+##  
+##  # Overriding shared spec: Deactivated spec. This spec will be removed soon.
+##  xl_16_1_1_12_gcc_8_3_1_cuda_11_0_2:
+##    variables:
+##      SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %xl@16.1.1.12 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ^cuda@11.0.2 ${PROJECT_LASSEN_DEPS}"
+##    extends: .build_and_test_on_lassen
+##    script:
+##      - |
+##        echo -e "\e[31mDeactivated spec !\e[0m"
+##        echo -e "\e[31m${SPEC}\e[0m"
+##        echo -e "\e[31mRAJA won’t build with Cuda < 11.0.2 due to a known issue.\e[0m"
+##      - exit 1
+##    allow_failure: true
+##  
+##  # Overriding shared spec: Longer allocation + Extra flags + Allow failure + Updated cuda
+##  xl_16_1_1_12_gcc_8_3_1_cuda_11_1_0:
+##    variables:
+##      SPEC: " ${PROJECT_LASSEN_VARIANTS} +cuda %xl@16.1.1.12 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 -qthreaded -std=c++14 -O3 -qstrict -qxlcompatmacros -qlanglvl=extended0x -qalias=noansi -qhot -qpic -qsmp=omp -qsuppress=1500-029 -qsuppress=1500-036\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cuda_arch=70 ^cuda@11.1.0 ${PROJECT_LASSEN_DEPS}"
+##      LASSEN_BUILD_AND_TEST_JOB_ALLOC: "1 -W 120"
+##    allow_failure: true
+##    extends: .build_and_test_on_lassen
+
+# Overriding shared spec: Longer allocation + extra flags
+xl_2022_08_19_gcc_8_3_1_cuda_11_2_0:
+  variables:
+    SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda cxxflags==\"-qthreaded -std=c++14 -O3 -qstrict -qxlcompatmacros -qlanglvl=extended0x -qalias=noansi -qhot -qpic -qsmp=omp -qsuppress=1500-029 -qsuppress=1500-036\" %xl@16.1.1.12.gcc.8.3.1 ^cuda@11.2.0+allow-unsupported-compilers ${PROJECT_LASSEN_DEPS}"
     LASSEN_BUILD_AND_TEST_JOB_ALLOC: "1 -W 120"
-  allow_failure: true
   extends: .build_and_test_on_lassen
 
-# Overriding shared spec: Deactivated spec. This spec will be removed soon.
-xl_16_1_1_12_gcc_7_3_1_cuda_10_1_168:
+# Overriding shared spec: Longer allocation + extra flags
+xl_2022_08_19_gcc_8_3_1_cuda_11_7_0:
   variables:
-    SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %xl@16.1.1.12 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-7.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-7.3.1\" ^cuda@10.1.168 ${PROJECT_LASSEN_DEPS}"
-  extends: .build_and_test_on_lassen
-  script:
-    - |
-      echo -e "\e[31mDeactivated spec !\e[0m"
-      echo -e "\e[31m${SPEC}\e[0m"
-      echo -e "\e[31mRAJA won’t build with Cuda < 11.1.0 due to a known issue.\e[0m"
-    - exit 1
-  allow_failure: true
-
-# Overriding shared spec: Deactivated spec. This spec will be removed soon.
-xl_16_1_1_12_gcc_8_3_1_cuda_11_0_2:
-  variables:
-    SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %xl@16.1.1.12 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ^cuda@11.0.2 ${PROJECT_LASSEN_DEPS}"
-  extends: .build_and_test_on_lassen
-  script:
-    - |
-      echo -e "\e[31mDeactivated spec !\e[0m"
-      echo -e "\e[31m${SPEC}\e[0m"
-      echo -e "\e[31mRAJA won’t build with Cuda < 11.0.2 due to a known issue.\e[0m"
-    - exit 1
-  allow_failure: true
-
-# Overriding shared spec: Longer allocation + Extra flags + Allow failure + Updated cuda
-xl_16_1_1_12_gcc_8_3_1_cuda_11_1_0:
-  variables:
-    SPEC: " ${PROJECT_LASSEN_VARIANTS} +cuda %xl@16.1.1.12 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 -qthreaded -std=c++14 -O3 -qstrict -qxlcompatmacros -qlanglvl=extended0x -qalias=noansi -qhot -qpic -qsmp=omp -qsuppress=1500-029 -qsuppress=1500-036\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cuda_arch=70 ^cuda@11.1.0 ${PROJECT_LASSEN_DEPS}"
+    SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda cxxflags==\"-qthreaded -std=c++14 -O3 -qstrict -qxlcompatmacros -qlanglvl=extended0x -qalias=noansi -qhot -qpic -qsmp=omp -qsuppress=1500-029 -qsuppress=1500-036\" %xl@16.1.1.12.gcc.8.3.1 ^cuda@11.7.0+allow-unsupported-compilers ${PROJECT_LASSEN_DEPS}"
     LASSEN_BUILD_AND_TEST_JOB_ALLOC: "1 -W 120"
-  allow_failure: true
   extends: .build_and_test_on_lassen
 
 
@@ -109,33 +123,10 @@ xl_16_1_1_12_gcc_8_3_1_cuda_11_1_0:
 # ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
 # describe the spec here.
 
-##########
-# CPU ONLY
-##########
-
-clang_14_0_5:
-  variables:
-    SPEC: " ~shared +openmp +tests %clang@14.0.5"
-  extends: .build_and_test_on_lassen
-
-##########
-# CUDA
-##########
-
-clang_12_0_1_cuda_11_5_0:
-  variables:
-    SPEC: " ~shared +openmp +tests +cuda cuda_arch=70 %clang@12.0.1 ^cuda@11.5.0"
-  extends: .build_and_test_on_lassen
-
-gcc_8_3_1_cuda_11_1_0:
-  variables:
-    SPEC: " ~shared +openmp +tests +cuda %gcc@8.3.1 cuda_arch=70 ^cuda@11.1.0"
-  extends: .build_and_test_on_lassen
-
 gcc_8_3_1_cuda_11_5_0_ats_disabled:
   extends: .build_and_test_on_lassen
   variables:
-    SPEC: " ~shared +openmp +tests +cuda %gcc@8.3.1 cuda_arch=70 ^cuda@11.5.0"
+    SPEC: " ~shared +openmp +tests +cuda %gcc@8.3.1 cuda_arch=70 ^cuda@11.5.0+allow-unsupported-compilers"
     LASSEN_BUILD_AND_TEST_JOB_ALLOC: "1 --atsdisable -W 60"
 
 ##########
@@ -144,7 +135,7 @@ gcc_8_3_1_cuda_11_5_0_ats_disabled:
 
 clang_13_0_1_libcpp:
   variables:
-    SPEC: " ~shared +openmp +tests %clang@13.0.1+libcpp"
+    SPEC: " ~shared +openmp +tests +libcpp %clang@13.0.1"
   extends: .build_and_test_on_lassen
 
 clang_14_0_5_asan:
@@ -153,7 +144,7 @@ clang_14_0_5_asan:
     ASAN_OPTIONS: "detect_leaks=1"
   extends: .build_and_test_on_lassen
 
-gcc_8_3_1_cuda_10_1_168_desul_atomics:
+gcc_8_3_1_cuda_10_1_243_desul_atomics:
   variables:
-    SPEC: " ~shared +openmp +tests +cuda +desul %gcc@8.3.1 cuda_arch=70 ^cuda@10.1.168"
+    SPEC: " ~shared +openmp +tests +cuda +desul %gcc@8.3.1 cuda_arch=70 ^cuda@10.1.243+allow-unsupported-compilers"
   extends: .build_and_test_on_lassen

.gitlab/ruby-build-and-test-extra.yml

@@ -12,19 +12,19 @@
 # We keep ${PROJECT_<MACHINE>_VARIANTS} and ${PROJECT_<MACHINE>_DEPS} So that
 # the comparison with the original job is easier.
 
-# Overriding shared config for longer run
-gcc_8_1_0:
-  variables:
-    SPEC: " ${PROJECT_RUBY_VARIANTS} %gcc@8.1.0 ${PROJECT_RUBY_DEPS}"
-    RUBY_BUILD_AND_TEST_JOB_ALLOC: "--time=60 --nodes=1"
-  extends: .build_and_test_on_ruby
-
-# Overriding shared spec: Allow failures
-pgi_20_1_gcc_local_8_3_1:
-  variables:
-    SPEC: " ${PROJECT_RUBY_VARIANTS} %pgi@20.1 cxxflags==\"-rc=/usr/workspace/umpire/pgi/x86_64/local-gcc-8.3.1-rc\" cflags==\"-rc=/usr/workspace/umpire/pgi/x86_64/local-gcc-8.3.1-rc\" fflags==\"-rc=/usr/workspace/umpire/pgi/x86_64/local-gcc-8.3.1-rc\" ${PROJECT_RUBY_DEPS}"
-  extends: .build_and_test_on_ruby
-  allow_failure: true
+##  # Overriding shared config for longer run
+##  gcc_8_1_0:
+##    variables:
+##      SPEC: " ${PROJECT_RUBY_VARIANTS} %gcc@8.1.0 ${PROJECT_RUBY_DEPS}"
+##      RUBY_BUILD_AND_TEST_JOB_ALLOC: "--time=60 --nodes=1"
+##    extends: .build_and_test_on_ruby
+##  
+##  # Overriding shared spec: Allow failures
+##  pgi_20_1_gcc_local_8_3_1:
+##    variables:
+##      SPEC: " ${PROJECT_RUBY_VARIANTS} %pgi@20.1 cxxflags==\"-rc=/usr/workspace/umpire/pgi/x86_64/local-gcc-8.3.1-rc\" cflags==\"-rc=/usr/workspace/umpire/pgi/x86_64/local-gcc-8.3.1-rc\" fflags==\"-rc=/usr/workspace/umpire/pgi/x86_64/local-gcc-8.3.1-rc\" ${PROJECT_RUBY_DEPS}"
+##    extends: .build_and_test_on_ruby
+##    allow_failure: true
 
 ############
 # Extra jobs
@@ -33,26 +33,20 @@ pgi_20_1_gcc_local_8_3_1:
 # ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
 # describe the spec here.
 
-clang_9_0_0_openmp_off:
+clang_14_0_4_openmp_off:
   variables:
-    SPEC: " ~shared ~openmp +tests %clang@9.0.0"
+    SPEC: " ~shared ~openmp +tests %clang@14.0.4"
   extends: .build_and_test_on_ruby
 
-gcc_8_1_0_openmp_default:
+gcc_10_2_1_openmp_default:
   variables:
-    SPEC: " ~shared +tests %gcc@8.1.0"
+    SPEC: " ~shared +tests %gcc@10.2.1"
     RUBY_BUILD_AND_TEST_JOB_ALLOC: "--time=60 --nodes=1"
   extends: .build_and_test_on_ruby
 
-icpc_19_1_0:
-  variables:
-    SPEC: " ~shared +openmp +tests %intel@19.1.0"
-    RUBY_BUILD_AND_TEST_JOB_ALLOC: "--time=40 --nodes=1"
-  extends: .build_and_test_on_ruby
-
 # OTHERS
-clang_10_0_1_gcc_8_3_1_desul_atomics:
+clang_12_0_1_gcc_8_3_1_desul_atomics:
   variables:
-    SPEC: " ~shared +openmp +tests +desul %clang@10.0.1 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\""
+    SPEC: " ~shared +openmp +tests +desul %clang@12.0.1.gcc.8.3.1"
   extends: .build_and_test_on_ruby
 

.gitlab/tioga-build-and-test-extra.yml

@@ -21,12 +21,12 @@
 # ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
 # describe the spec here.
 
-rocm_5_2_3_clang_13_0_0_desul_atomics:
+rocm_5_4_3_clang_15_0_0_desul_atomics:
   variables:
-    SPEC: "~shared +rocm ~openmp +desul +tests amdgpu_target=gfx90a %clang@13.0.0 ^blt@develop ^hip@5.2.3"
+    SPEC: "~shared +rocm ~openmp +desul +tests amdgpu_target=gfx90a %clang@15.0.0.rocm.5.4.3 ^blt@develop ^hip@5.4.3"
   extends: .build_and_test_on_tioga
 
-rocm_5_2_3_clang_13_0_0_openmp:
+rocm_5_4_3_clang_15_0_0_openmp:
   variables:
-    SPEC: "~shared +rocm +openmp +tests amdgpu_target=gfx90a %clang@13.0.0 ^blt@develop ^hip@5.2.3"
+    SPEC: "~shared +rocm +openmp +tests amdgpu_target=gfx90a %clang@15.0.0.rocm.5.4.3 ^blt@develop ^hip@5.4.3"
   extends: .build_and_test_on_tioga

cmake/RAJAMacros.cmake

@@ -103,7 +103,7 @@ macro(raja_add_plugin_library)
 
 endmacro(raja_add_plugin_library)
 
-# Allows strings embedded in test files to used to process ctest results.
+# Allows strings embedded in test files to be used to process ctest results.
 # Only works for new testing framework/structure (no effect on old tests).
 # Borrowed heavily from CAMP.
 function(raja_set_failtest TESTNAME)
@@ -127,6 +127,8 @@ function(raja_set_failtest TESTNAME)
 
     # Search test source code for fail string
     foreach(line ${test_lines})
+      # We know the line will match the regex, but the following populates the
+      # CMAKE_MATCH-<n> variables with groups from the regex.
       if(NOT line MATCHES "${test_regex}")
         continue()
       endif()

test/CMakeLists.txt

@@ -17,3 +17,4 @@ add_subdirectory(old-tests)
 
 add_subdirectory(install)
 
+configure_file(${CMAKE_SOURCE_DIR}/test/CTestCustom.cmake ${CMAKE_BINARY_DIR})