From b3a198696ff29d60798de8a5b4d70456823c044e Mon Sep 17 00:00:00 2001
From: Rich Hornung <hornung1@llnl.gov>
Date: Thu, 25 Jul 2024 15:00:58 -0700
Subject: [PATCH] Add some desul checks, move some builds around

---
 .github/workflows/build.yml |  2 +-
 Dockerfile                  | 18 +++++++++++++++++-
 azure-pipelines.yml         |  6 ++++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fae97ee712..4f9d9a67c1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ jobs:
   build_docker:
     strategy:
       matrix:
-        target: [gcc12, gcc13, clang13, clang15, rocm5.6, rocm5.6_desul, intel2024, intel2024_sycl]
+        target: [gcc12, gcc13, clang13, clang15, rocm5.6_desul, intel2024, intel2024_sycl]
     runs-on: ubuntu-latest
     steps:
     - run: |
diff --git a/Dockerfile b/Dockerfile
index c7b22aac29..0fd23f163b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,15 @@ FROM ghcr.io/llnl/radiuss:gcc-12-ubuntu-22.04 AS gcc12_debug
 ENV GTEST_COLOR=1
 COPY . /home/raja/workspace
 WORKDIR /home/raja/workspace/build
-RUN cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_OPENMP=On .. && \
+RUN cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Debug -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_OPENMP=On .. && \
+    make -j 6 &&\
+    ctest -T test --output-on-failure
+
+FROM ghcr.io/llnl/radiuss:gcc-12-ubuntu-22.04 AS gcc12_desul
+ENV GTEST_COLOR=1
+COPY . /home/raja/workspace
+WORKDIR /home/raja/workspace/build
+RUN cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_OPENMP=On -DRAJA_ENABLE_DESUL_ATOMICS=On .. && \
     make -j 6 &&\
     ctest -T test --output-on-failure
 
@@ -67,6 +75,14 @@ RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -DENABLE_OPENM
     make -j 16 &&\
     ctest -T test --output-on-failure
 
+FROM ghcr.io/llnl/radiuss:clang-15-ubuntu-22.04 AS clang15_desul
+ENV GTEST_COLOR=1
+COPY . /home/raja/workspace
+WORKDIR /home/raja/workspace/build
+RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -DENABLE_OPENMP=On -DRAJA_ENABLE_DESUL_ATOMICS=On .. && \
+    make -j 16 &&\
+    ctest -T test --output-on-failure
+
 ## Test run failure in RAJA launch tests with new reducer interface.
 ## Need to figure out best way to handle that.
 FROM ghcr.io/llnl/radiuss:ubuntu-20.04-intel-2024.0 AS intel2024
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 13797d75d4..096b0cbcfc 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -36,12 +36,14 @@ jobs:
     matrix: 
       gcc12_debug:
         docker_target: gcc12_debug
+      gcc12_desul:
+        docker_target: gcc12_desul
       clang14_debug:
         docker_target: clang14_debug
+      clang15_desul:
+        docker_target: clang15_desul
       rocm5.6:
         docker_target: rocm5.6
-      rocm5.6_desul:
-        docker_target: rocm5.6_desul
   pool:
     vmImage: 'ubuntu-latest'
   variables: