Merge branch 'sycl' of https://github.com/intel/llvm into cmdlist

Author: rdeodhar

.github/workflows/sycl_linux_build_and_test.yml

@@ -172,10 +172,13 @@ jobs:
     outputs:
       lts: ${{ steps.work.outputs.lts }}
     steps:
-    - name: Download scripts
+    - name: Download scripts and configs
       run: |
         wget raw.githubusercontent.com/intel/llvm/${{ github.sha }}/devops/scripts/generate_test_matrix.js
         wget raw.githubusercontent.com/intel/llvm/${{ github.sha }}/devops/test_configs.json
+        wget raw.githubusercontent.com/intel/llvm/sycl/devops/dependencies.json
+        mv dependencies.json dependencies.sycl.json
+        wget raw.githubusercontent.com/intel/llvm/${{ github.sha }}/devops/dependencies.json
     - id: work
       uses: actions/github-script@v6
       name: Generate matrix
@@ -196,6 +199,7 @@ jobs:
         include: ${{ fromJSON(needs.resolve_matrix.outputs.lts) }}
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.runs-on }}
+    env: ${{ matrix.env }}
     container:
       image: ${{ matrix.image }}
       options: ${{ matrix.container_options }}
@@ -208,6 +212,15 @@ jobs:
     - run: cp -r /actions .
     - name: Register cleanup after job is finished
       uses: ./actions/cleanup
+    - name: Install drivers
+      if: env.compute_runtime_tag != ''
+      run: |
+        if [ -e /opt/install_drivers.sh ]; then
+          # TODO pack this script into container
+          wget raw.githubusercontent.com/intel/llvm/${{ github.sha }}/devops/scripts/get_release.py
+          sudo mv get_release.py /opt/
+          sudo -E /opt/install_drivers.sh --all
+        fi
     # FIXME cached_checkout fails here, but works everywhere else
     - uses: actions/checkout@v2
       with:

.github/workflows/sycl_nightly.yml

@@ -16,7 +16,8 @@ jobs:
     with:
       build_cache_root: "/__w/"
       build_artifact_suffix: default
-      lts_config: "ocl_gen9;ocl_x64;hip_amdgpu"
+      build_configure_extra_args: ''
+      lts_config: "ocl_gen9;ocl_x64"
 
   windows_default:
     name: Windows

clang/include/clang/Basic/AttrDocs.td

@@ -3629,6 +3629,7 @@ occur after the first argument of the attribute, the N+2'th argument of the
 attribute will occur after the second argument of the attribute, etc.
 The generated call to ``llvm.ptr.annotation`` will have the following arguments
 in this order:
+
   * First argument is a pointer to the field.
   * A pointer to a string literal in a constant global variable. This will
     always be "sycl-properties".
@@ -3639,6 +3640,7 @@ in this order:
     literals in constant global variables. These pointers to string literals
     occur in pairs. If the second value of a pair was a ``nullptr`` or an empty
     string then the pointer will be a null-pointer.
+
 A pair will not be in the call to ``llvm.ptr.annotation`` if the first value of
 the pair is an empty string.
 

devops/actions/llvm_test_suite/action.yml

@@ -93,7 +93,6 @@ runs:
       echo "::endgroup::"
       echo "::group::SYCL_PI_TRACE=-1 sycl-ls"
       echo $LD_LIBRARY_PATH
-      ldd $PWD/toolchain/lib/libpi_hip.so
       SYCL_PI_TRACE=-1 sycl-ls
       echo "::endgroup::"
       cd build

devops/scripts/generate_test_matrix.js

@@ -4,15 +4,45 @@ module.exports = ({core, process}) => {
     if (err) {
       console.log(`Error reading file from disk: ${err}`);
     } else {
+      const driverNew =
+          JSON.parse(fs.readFileSync('./dependencies.json', 'utf8'));
+      const driverOld =
+          JSON.parse(fs.readFileSync('./dependencies.sycl.json', 'utf8'));
       const testConfigs = JSON.parse(data);
       const inputs = JSON.parse(process.env.GHA_INPUTS);
+      const needsDrivers =
+          driverNew["linux"]["compute_runtime"]["version"] !==
+              driverOld["linux"]["compute_runtime"]["version"] ||
+          driverNew["linux"]["igc"]["version"] !==
+              driverOld["linux"]["igc"]["version"] ||
+          driverNew["linux"]["cm"]["version"] !==
+              driverOld["linux"]["cm"]["version"] ||
+          driverNew["linux"]["tbb"]["version"] !==
+              driverOld["linux"]["tbb"]["version"] ||
+          driverNew["linux"]["oclcpu"]["version"] !==
+              driverOld["linux"]["oclcpu"]["version"] ||
+          driverNew["linux"]["fpgaemu"]["version"] !==
+              driverOld["linux"]["fpgaemu"]["version"];
 
       const ltsConfigs = inputs.lts_config.split(';');
 
       const enabledLTSConfigs = [];
 
       testConfigs.lts.forEach(v => {
         if (ltsConfigs.includes(v.config)) {
+          if (needsDrivers) {
+            v["env"] = {
+              "compute_runtime_tag" :
+                  driverNew["linux"]["compute_runtime"]["github_tag"],
+              "igc_tag" : driverNew["linux"]["igc"]["github_tag"],
+              "cm_tag" : driverNew["linux"]["cm"]["github_tag"],
+              "tbb_tag" : driverNew["linux"]["tbb"]["github_tag"],
+              "cpu_tag" : driverNew["linux"]["oclcpu"]["github_tag"],
+              "fpgaemu_tag" : driverNew["linux"]["fpgaemu"]["github_tag"],
+            };
+          } else {
+            v["env"] = {};
+          }
           enabledLTSConfigs.push(v);
         }
       });
@@ -23,6 +53,11 @@ module.exports = ({core, process}) => {
       for (let [key, value] of Object.entries(inputs)) {
         ltsString = ltsString.replaceAll("${{ inputs." + key + " }}", value);
       }
+      if (needsDrivers) {
+        ltsString = ltsString.replaceAll(
+            "ghcr.io/intel/llvm/ubuntu2004_intel_drivers:latest",
+            "ghcr.io/intel/llvm/ubuntu2004_base:latest");
+      }
 
       core.setOutput('lts', ltsString);
     }

devops/scripts/install_drivers.sh

@@ -21,6 +21,7 @@ fi;
 
 InstallTBB () {
   if [ "$TBB_INSTALLED" = false ]; then
+    mkdir -p $INSTALL_LOCATION
     cd $INSTALL_LOCATION
     echo "Installing TBB..."
     echo "TBB version $TBB_TAG"
@@ -54,6 +55,7 @@ InstallIGFX () {
 InstallCPURT () {
   echo "Installing Intel OpenCL CPU Runtime..."
   echo "CPU Runtime version $CPU_TAG"
+  mkdir -p $INSTALL_LOCATION
   cd $INSTALL_LOCATION
   if [ -d "$INSTALL_LOCATION/oclcpu" ]; then
     echo "$INSTALL_LOCATION/oclcpu exists and will be removed!"
@@ -73,12 +75,13 @@ InstallCPURT () {
 InstallFPGAEmu () {
   echo "Installing Intel FPGA Fast Emulator..."
   echo "FPGA Emulator version $FPGA_TAG"
+  mkdir -p $INSTALL_LOCATION
   cd $INSTALL_LOCATION
   if [ -d "$INSTALL_LOCATION/fpgaemu" ]; then
     echo "$INSTALL_LOCATION/fpgaemu exists and will be removed!"
     rm -Rf $INSTALL_LOCATION/oclcpu;
   fi
-  python3 /get_release.py intel/llvm $FPGA_TAG \
+  python3 $LOCATION/get_release.py intel/llvm $FPGA_TAG \
     | grep -E ".*fpgaemu.*tar.gz" \
     | wget -qi - && \
     mkdir fpgaemu && tar -xf *.tar.gz -C fpgaemu && rm *.tar.gz

libclc/utils/libclc-remangler/CMakeLists.txt

@@ -5,6 +5,7 @@ set(LLVM_LINK_COMPONENTS
   Core
   Demangle
   Support
+  TransformUtils
   )
 
 add_clang_tool(libclc-remangler LibclcRemangler.cpp)