"ock" input becomes "opencl" for sycl_cts build/test - and rename artefacts and .csv files; no downloads

Author: alan-forbes-cp

.github/actions/do_build_sycl_cts/action.yml

@@ -5,8 +5,8 @@ inputs:
   target:
     description: 'target architecture'
   sycl_device:
-    description: '"ock" or "native_cpu"'
-    default: 'ock'
+    description: '"opencl" or "native_cpu"'
+    default: 'opencl'
   download_sycl_cts_artefact:
     description: 'download sycl_cts artefact rather than building, of form <target>=id;<target2=id2>.'
     default: ''    
@@ -25,14 +25,14 @@ runs:
       uses: llvm/actions/install-ninja@main
 
     - name: download icd artifact
-      if: inputs.sycl_device == 'ock' && contains(inputs.download_sycl_cts_artefact, inputs.target) != true
+      if: inputs.sycl_device == 'opencl' && contains(inputs.download_sycl_cts_artefact, inputs.target) != true
       uses: actions/download-artifact@v4
       with:
         name: icd_${{inputs.target}}
         path: install_icd
 
     - name: download headers artifact
-      if: inputs.sycl_device == 'ock' && contains(inputs.download_sycl_cts_artefact, inputs.target) != true
+      if: inputs.sycl_device == 'opencl' && contains(inputs.download_sycl_cts_artefact, inputs.target) != true
       uses: actions/download-artifact@v4
       with:
         name: header_${{inputs.target}}
@@ -77,7 +77,7 @@ runs:
             git -C SYCL-CTS.src apply "$patch"
           fi
         done
-        if [[ "${{inputs.sycl_device}}" = "ock" ]] ; then
+        if [[ "${{inputs.sycl_device}}" = "opencl" ]] ; then
           DEV_OPTS="-DOpenCL_LIBRARY=$GITHUB_WORKSPACE/install_icd/lib/libOpenCL.so -DOpenCL_INCLUDE_DIR=$GITHUB_WORKSPACE/install_headers/include"
         else # native_cpu
           DEV_OPTS="-DSYCL_CTS_ENABLE_OPENCL_INTEROP_TESTS=OFF -DDPCPP_FLAGS='-fsycl-targets=native_cpu'"

.github/actions/run_sycl_cts/action.yml

@@ -5,8 +5,8 @@ inputs:
   target:
     description: 'target architecture'
   sycl_device:
-    description: '"ock" or "native_cpu"'
-    default: 'ock'
+    description: '"opencl" or "native_cpu"'
+    default: 'opencl'
 
 runs:
   using: "composite"
@@ -21,7 +21,7 @@ runs:
       uses: llvm/actions/install-ninja@main
 
     - name: download ock artifact
-      if: inputs.sycl_device == 'ock'
+      if: inputs.sycl_device == 'opencl'
       uses: actions/download-artifact@v4
       with:
         name: ock_${{inputs.target}}
@@ -62,7 +62,7 @@ runs:
       run: |
         echo running sycl cts
         export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/install_dpcpp/lib
-        if [[ "${{inputs.sycl_device}}" = "ock" ]] ; then
+        if [[ "${{inputs.sycl_device}}" = "opencl" ]] ; then
           export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GITHUB_WORKSPACE/install_ock/lib
           export ONEAPI_DEVICE_SELECTOR=opencl:0
           export OCL_ICD_FILENAMES=$GITHUB_WORKSPACE/install_ock/lib/libCL.so

.github/sycl_cts/override_ock.csv renamed to .github/sycl_cts/override_opencl.csv

@@ -315,11 +315,11 @@ jobs:
       fail-fast: false  # let all matrix jobs complete
       matrix:
         target: ${{ fromJson(inputs.target_list) }}
-        sycl_device: [ 'ock', 'native_cpu' ]
+        sycl_device: [ 'opencl', 'native_cpu' ]
         # TODO: For now just linux x86_64 & aarch64
         exclude:
           - sycl_device: ${{ ! inputs.native_cpu && 'native_cpu' }}
-          - sycl_device: ${{ ! inputs.ock && 'ock' }}
+          - sycl_device: ${{ ! inputs.ock && 'opencl' }}
           - ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64) }}
 
     runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'cp-graviton' || 'cp-ubuntu-24.04' }}
@@ -352,11 +352,11 @@ jobs:
       fail-fast: false  # let all matrix jobs complete
       matrix:
         target: ${{ fromJson(inputs.target_list) }}
-        sycl_device: [ 'ock', 'native_cpu' ]
+        sycl_device: [ 'opencl', 'native_cpu' ]
         # TODO: For now just linux x86_64 and aarch64
         exclude:
           - sycl_device: ${{ ! inputs.native_cpu && 'native_cpu' }}
-          - sycl_device: ${{ ! inputs.ock && 'ock' }}
+          - sycl_device: ${{ ! inputs.ock && 'opencl' }}
           - ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64) }}
 
     runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'cp-graviton' || 'cp-ubuntu-24.04' }}

.github/sycl_cts/override_ock_host_aarch64_linux.csv renamed to .github/sycl_cts/override_opencl_host_aarch64_linux.csv

@@ -40,9 +40,6 @@ jobs:
 
       # The following can be used to download from a previous workflow run (change id)
       # download_ock_artefact: host_x86_64_linux=12915462445;host_aarch64_linux=12915462445
-      download_ock_artefact: host_x86_64_linux=14080727549
       # download_dpcpp_artefact: host_x86_64_linux=12915462445;host_aarch64_linux=12915462445
-      download_dpcpp_artefact: host_x86_64_linux=14080727549
       # download_sycl_cts_artefact: host_x86_64_linux=12915462445;host_aarch64_linux=12915462445      
-      download_sycl_cts_artefact: host_x86_64_linux=14080727549
       pull_request: ${{ github.event_name == 'pull_request' }}