Merge branch 'develop' into ci/bowen/add-openmp-windows

Author: johnbowen42

.gitlab/jobs/corona.yml

@@ -38,10 +38,10 @@ rocmcc_5_7_1_hip_desul_atomics:
     SPEC: " ~shared +rocm ~openmp +tests +desul amdgpu_target=gfx906 %llvm-amdgpu@=5.7.1 ^hip@5.7.1"
   extends: .job_on_corona
 
-clang_22_0_0_sycl_gcc_10_3_1_rocmcc_6_4_2:
+clang_22_0_0_sycl_gcc_10_3_1_rocmcc_6_4_3:
   variables:
     SPEC: " ~shared +sycl ~openmp +tests cxxflags==\"-w -fsycl -fsycl-unnamed-lambda -fsycl-targets=amdgcn-amd-amdhsa -Xsycl-target-backend --offload-arch=gfx906\" %sycl-clang-22-gcc-10"
-    MODULE_LIST: "rocm/6.4.2"
-    SYCL_PATH: "/usr/workspace/raja-dev/clang_sycl_16b7bcb09915_hip_gcc10.3.1_rocm6.4.2"
+    MODULE_LIST: "rocm/6.4.3"
+    SYCL_PATH: "/usr/workspace/raja-dev/clang_sycl_16b7bcb09915_hip_gcc10.3.1_rocm6.4.3"
     LD_LIBRARY_PATH: "${SYCL_PATH}/lib:${SYCL_PATH}/lib64:${LD_LIBRARY_PATH}"
   extends: .job_on_corona

docs/sphinx/dev_guide/ci_tasks.rst

@@ -190,46 +190,47 @@ Building the Compiler
 ^^^^^^^^^^^^^^^^^^^^^
 
 .. important:: Because Intel updates their compiler repo daily, it is possible
-   that the head of the SYCL branch will fail to build. In the event that it
-   does not build, try checking out an earlier commit. On the Intel/LLVM GitHub
-   page, one can see which of their commits builds by checking the status
-   badge next to each commit. Look for a commit that passes.
+   that the head of the SYCL branch will fail to build. If it does not build,
+   try checking out an earlier commit in your local cloned repo. On the
+   `Intel/LLVM GitHub Project <https://github.com/intel/llvm>`_, you can see
+   which of their commits builds by checking the status badge next to each
+   commit. Look for a recent commit that passes.
 
 
-#. On LC machines, it is following the good neighbor policy to do your build on a compute node.
+#. On LC machines, please follow the good neighbor policy and do your build on a compute node.
 
    Use an appropriate bank to get an interactive node, e.g on Corona::
 
     flux alloc -t 60 -N 1 --bank=wbronze
 
-#. Load the module of the version of GCC headers that you want to use. We typically use the system default, which on corona at time of writing is gcc/10.3.1-magic::
+#. Load the module of the version of GCC headers that you want to use. We typically use the system default, which on corona is currently gcc/10.3.1-magic. Set then environment variable ``GCC_VERSION`` to the GCC version, then load the module::
 
-    GCC_VERSION=10.3.1
     module load gcc/${GCC_VERSION}-magic
 
-#. Load the module of the version of ROCm that you want to use::
-    ROCM_VERSION=6.4.2
+#. Load the module of the version of ROCm that you want to use. Set the environment variable ``ROCM_VERSION`` to the ROCm version, then load the module::
+
     module load rocm/${ROCM_VERSION}
 
-#. Load Python module you want to use.  At time of writing, the LLVM configure requires at least version 3.7. we use Corona default::
-    PYTHON_VERSION=3.9.12
+#. Load Python module you want to use. The LLVM configure requires at least version 3.7. Set the environment variable ``PYTHON_VERSION`` to the Python version, then load the module::
+
     module load python/${PYTHON_VERSION}
     
 #. Clone the SYCL branch of Intel's LLVM compiler::
 
     git clone https://github.com/intel/llvm -b sycl
 
-#. cd into the LLVM folder and extract the GIT SHA for naming the install directories.  The install directory uses the naming convention ``clang_sycl_<git sha>_hip_gcc<version>_rocm<version>``::
+#. Go into the LLVM folder and get the Git SHA for the commit hash you are building. The first 12 characters of the hash value are used in the name of the compiler install directory. To get the first 12 characters of the hash value::
 
     cd llvm
-    GIT_SHA=$(git rev-parse --short=12 HEAD)
-    INSTALL_PREFIX=/usr/workspace/raja-dev/clang_sycl_${GIT_SHA}_hip_gcc${GCC_VERSION}_rocm${ROCM_VERSION}
+    git rev-parse --short=12 HEAD
 
-#. Build the compiler. 
+#. Then, set the environment variable ``GIT_SHA`` to the hash value, and set the environment variable ``INSTALL_PREFIX`` to the name of the installation directory, which has the following form:  ``/usr/workspace/raja-dev/clang_sycl_${GIT_SHA}_hip_gcc${GCC_VERSION}_rocm${ROCM_VERSION}``
 
-   a. Configure
+#. After, the compiler repo code is in place and the build environment is set as described in the previous steps, build and install the compiler.
 
-     .. code-block:: bash
+   a. Configure:
+
+.. code-block:: bash
 
      python3 buildbot/configure.py --hip -o buildrocm${ROCM_VERSION} \
      --cmake-gen "Unix Makefiles" \
@@ -244,16 +245,16 @@ Building the Compiler
      --cmake-opt=-DUR_HIP_HSA_INCLUDE_DIR=/opt/rocm-${ROCM_VERSION}/hsa/include/hsa \
      --cmake-opt=-DUR_HIP_LIB_DIR=/opt/rocm-${ROCM_VERSION}/lib 
 
-   #. Build::
+   b. Build::
 
       python buildbot/compile.py -o buildrocm${ROCM_VERSION}		     
 
-   #. Install::
+   c. Install::
 	
       cp -rp buildrocm${ROCM_VERSION}/install ${INSTALL_PREFIX}
       cd ..
 
-#. Set the permissions of the folder, and everything in it to 750::
+#. Set the permissions of the installation folder, and everything in it to 750::
 
       chmod 750 ${INSTALL_PREFIX} -R  
 
@@ -270,7 +271,7 @@ Using the compiler
 
 #. Load the version of ROCm that you used when building the compiler, for example::
 
-    ROCM_VERSION=6.4.2 
+    ROCM_VERSION=6.4.3 
     module load rocm/${ROCM_VERSION}
 
 #. Navigate to the root of your local RAJA checkout space::
@@ -281,15 +282,15 @@ Using the compiler
 
    This is the ``INSTALL_PREFIX`` used above.  For example::
 
-    SYCL_INSTALL_PREFIX=/usr/workspace/raja-dev/clang_sycl_16b7bcb09915_hip_gcc10.3.1_rocm6.4.2
+    SYCL_INSTALL_PREFIX=/usr/workspace/raja-dev/clang_sycl_16b7bcb09915_hip_gcc10.3.1_rocm6.4.3
 
 #. Run the test config script::
 
     ./scripts/lc-builds/corona_sycl.sh ${SYCL_INSTALL_PREFIX}
 
 #. As indicated in the output of the ``corona_sycl.sh`` script the SYCL compiler libraries need to be on the ``LD_LIBRARY_PATH``::
-   
-    export LD_LIBRARY_PATH=${SYCL_INSTALL_PREFIX}/lib:${SYCL_INSTALL_PREFIX}/lib64:$LD_LIBRARY_PATH    
+ 
+    export LD_LIBRARY_PATH=${SYCL_INSTALL_PREFIX}/lib:${SYCL_INSTALL_PREFIX}/lib64:$LD_LIBRARY_PATH
 
 #. cd into the generated build directory::
 

scripts/lc-builds/corona_sycl.sh

@@ -15,7 +15,7 @@ if [[ $# -lt 1 ]]; then
   echo "   1) SYCL compiler installation path"
   echo
   echo "For example: "
-  echo "    corona_sycl.sh /usr/workspace/raja-dev/clang_sycl_16b7bcb09915_hip_gcc10.3.1_rocm6.4.2"
+  echo "    corona_sycl.sh /usr/workspace/raja-dev/clang_sycl_16b7bcb09915_hip_gcc10.3.1_rocm6.4.3"
   exit
 fi