Add Graviton to Github CI OpenCL CTS planned testing

.github/actions/run_opencl_cts/action.yml

@@ -30,12 +30,10 @@ runs:
         cd "$GITHUB_WORKSPACE/OpenCL-CTS"
         echo "Running OpenCL CTS tests with CTS file $CTS_CSV_FILE with filter $CTS_FILTER"
         export QEMU_SETTING=""
-        if [[ "${{inputs.target}}" =~ .*aarch64.* ]] ; then
-          QEMU_SETTING="-p qemu --qemu '/usr/bin/qemu-aarch64 -L /usr/aarch64-linux-gnu'"
-        elif [[ "${{inputs.target}}" =~ .*riscv64.* ]] ; then
+        if [[ "${{inputs.target}}" =~ .*riscv64.* ]] ; then
           QEMU_SETTING="-p qemu --qemu '/usr/bin/qemu-riscv64 -L /usr/riscv64-linux-gnu'"
         fi
-        echo QEMU SETTING: $QEMU SETTING
+        echo QEMU SETTING: $QEMU_SETTING
         set -x
         # Note: use 'eval' built-in to handle quoting/escaping/splitting reqs
         RUN_CITIES="python3 -u $GITHUB_WORKSPACE/scripts/testing/run_cities.py -v \

.github/dockerfiles/Dockerfile_22.04-aarch64

@@ -0,0 +1,9 @@
+FROM ubuntu:22.04
+
+RUN apt-get update
+RUN apt-get -y install sudo
+RUN apt-get install -y git
+RUN apt-get install --yes cmake
+RUN apt-get install --yes gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
+RUN apt-get install --yes python3 python3-pip
+RUN apt-get install --yes spirv-tools

.github/workflows/codeql.yml

@@ -16,7 +16,7 @@ jobs:
       packages: read
     runs-on: ubuntu-22.04
     container:
-      image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest'
+      image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest'
       volumes:
         - ${{github.workspace}}:${{github.workspace}}
 
@@ -67,7 +67,7 @@ jobs:
       packages: read
     runs-on: ubuntu-22.04
     container:
-      image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest'
+      image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest'
       volumes:
         - ${{github.workspace}}:${{github.workspace}}
 

.github/workflows/create_publish_artifacts.yml

@@ -17,7 +17,7 @@ jobs:
   run_riscv_m1_nightly_package:
     runs-on: ubuntu-22.04
     container:
-      image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest'
+      image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest'
       volumes:
         - ${{github.workspace}}:${{github.workspace}}
 

.github/workflows/planned_testing.yml

@@ -59,10 +59,20 @@ jobs:
     - id: vars
       # TODO: If we expand on this, come up with a more programmatical way of doing only certain targets.
       # These variables are for excluding certain targets from the total list, which is why just including
-      # two targets is a long list of excludes
+      # certain targets involves a long list of excludes
       run: |
-        echo matrix_only_linux_x86_64_aarch64_riscv64="[ {\"target\": \"host_arm_linux\"}, {\"target\": \"host_refsi_linux\"}, {\"target\": \"host_i686_linux\"}, {\"target\": \"host_x86_64_windows\"}]" >> $GITHUB_OUTPUT
-        echo matrix_only_linux_x86_64="[ {\"target\": \"host_aarch64_linux\"}, {\"target\": \"host_riscv64_linux\"}, {\"target\": \"host_arm_linux\"}, {\"target\": \"host_refsi_linux\"}, {\"target\": \"host_i686_linux\"}, {\"target\": \"host_x86_64_windows\"}]" >> $GITHUB_OUTPUT
+        echo matrix_only_linux_x86_64_aarch64_riscv64="[ \
+           {\"target\": \"host_arm_linux\"}, \
+           {\"target\": \"host_refsi_linux\"}, \
+           {\"target\": \"host_i686_linux\"}, \
+           {\"target\": \"host_x86_64_windows\"}]" >> $GITHUB_OUTPUT
+        echo matrix_only_linux_x86_64="[ \
+           {\"target\": \"host_aarch64_linux\"}, \
+           {\"target\": \"host_riscv64_linux\"}, \
+           {\"target\": \"host_arm_linux\"}, \
+           {\"target\": \"host_refsi_linux\"}, \
+           {\"target\": \"host_i686_linux\"}, \
+           {\"target\": \"host_x86_64_windows\"}]" >> $GITHUB_OUTPUT
         cat $GITHUB_OUTPUT    
 
   create_ock_artefacts_windows:
@@ -97,7 +107,8 @@ jobs:
     # build llvm. Otherwise we choose ubuntu-22.04 (use a container for both for consistency).
     runs-on: cp-ubuntu-24.04
     container:
-      image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04:latest' || 'ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest' }}
+      image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04-x86-64:latest'
+             || 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest' }}
       volumes:
         - ${{github.workspace}}:${{github.workspace}}
     if : inputs.ock && contains(inputs.target_list, 'linux')
@@ -127,7 +138,8 @@ jobs:
 
     runs-on: cp-ubuntu-24.04
     container:
-      image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04:latest' || 'ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest' }}
+      image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04-x86-64:latest'
+             || 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest' }}
       volumes:
         - ${{github.workspace}}:${{github.workspace}}
     steps:
@@ -180,10 +192,11 @@ jobs:
         target: ${{ fromJson(inputs.target_list) }}
         exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64_riscv64) }}
 
-    # TODO: host-x86_64-linux only - expand for other targets
-    runs-on: cp-ubuntu-24.04
+    runs-on: ${{ contains(matrix.target, 'host_aarch64') && 'cp-graviton' || 'cp-ubuntu-24.04' }}
     container:
-      image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04:latest' || 'ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest' }}
+      image: ${{  contains(matrix.target, 'host_riscv')   && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04-x86-64:latest'
+             || ( contains(matrix.target, 'host_aarch64') && 'ghcr.io/alan-forbes-cp/ock_ubuntu_22.04-aarch64:latest'
+             || 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest' ) }}
       volumes:
         - ${{github.workspace}}:${{github.workspace}}
     steps:
@@ -218,7 +231,7 @@ jobs:
     # TODO: Extend if we decide to enable for windows or build natively on another target
     runs-on: cp-ubuntu-24.04
     container:
-      image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest'
+      image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest'
       volumes:
         - ${{github.workspace}}:${{github.workspace}}
 
@@ -248,7 +261,7 @@ jobs:
     # TODO: Extend if we decide to enable for windows or build natively on another target
     runs-on: cp-ubuntu-24.04
     container:
-      image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest'
+      image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest'
       volumes:
         - ${{github.workspace}}:${{github.workspace}}
 

.github/workflows/planned_testing_caller.yml

@@ -23,10 +23,16 @@ jobs:
     if: github.repository == 'uxlfoundation/oneapi-construction-kit' || github.event_name != 'schedule'
     uses: ./.github/workflows/planned_testing.yml
     with:
-      target_list: '[ "host_x86_64_linux", "host_aarch64_linux", "host_riscv64_linux", "host_i686_linux", "host_refsi_linux", "host_x86_64_windows" ]'
+      #target_list: '[ "host_x86_64_linux", \
+      #                "host_aarch64_linux", \
+      #                "host_riscv64_linux", \
+      #                "host_i686_linux", \
+      #                "host_refsi_linux", \
+      #                "host_x86_64_windows" ]'
+      target_list: '[ "host_aarch64_linux" ]'
       ock: true
-      test_tornado: true
-      test_sycl_cts: true
+      test_tornado: false
+      test_sycl_cts: false
       test_opencl_cts: true
       # Have a pull request setting which can be used to test the flow as best as possible
       # in a reasonable time

.github/workflows/publish_docker_images.yml

@@ -8,17 +8,19 @@ on:
     - '.github/workflows/publish_docker_images.yml'
     - '.github/dockerfiles/**'
 
+permissions:
+  contents: read
+  packages: write
+  attestations: write
+  id-token: write
+
+env:
+  REGISTRY: ghcr.io/uxlfoundation
+
 jobs:
 
-  publish-docker-images:
+  publish-docker-images-x86-64:
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      attestations: write
-      id-token: write
-    env:
-      REGISTRY: ghcr.io/uxlfoundation
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -30,8 +32,26 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: Build and push the Docker images
       run: |
-        for dockerfile in ${{ github.workspace }}/.github/dockerfiles/Dockerfile_* ; do
-          VERSION=${dockerfile##*_}
-          docker build . -f $dockerfile --tag $REGISTRY/ock_ubuntu_$VERSION:latest
+        for DOCKERFILE in ${{ github.workspace }}/.github/dockerfiles/Dockerfile_*x86-64 ; do
+          VERSION=${DOCKERFILE##*_}
+          docker build . -f $DOCKERFILE --tag $REGISTRY/ock_ubuntu_$VERSION:latest
           docker push $REGISTRY/ock_ubuntu_$VERSION:latest
         done
+
+  publish-docker-images-aarch64:
+    runs-on: ubuntu-22.04-arm
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Build and push the Docker images
+      run: |
+        DOCKERFILE=${{ github.workspace }}/.github/dockerfiles/Dockerfile_22.04-aarch64
+        VERSION=${DOCKERFILE##*_}
+        docker build . -f $DOCKERFILE --tag $REGISTRY/ock_ubuntu_$VERSION:latest
+        docker push $REGISTRY/ock_ubuntu_$VERSION:latest

.github/workflows/run_ock_demo.yml

@@ -19,7 +19,7 @@ jobs:
   run_riscv_m1_ock_demo:
     runs-on: ubuntu-22.04
     container:
-      image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest'
+      image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest'
       volumes:
         - ${{github.workspace}}:${{github.workspace}}
 

.github/workflows/run_pr_tests.yml

@@ -33,7 +33,7 @@ jobs:
   run_host_x86_64:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest
+      image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
       volumes:
         - ${{github.workspace}}:${{github.workspace}}    
     steps:
@@ -81,7 +81,7 @@ jobs:
 
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest
+      image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
       volumes:
         - ${{github.workspace}}:${{github.workspace}}    
     steps:
@@ -112,7 +112,7 @@ jobs:
 
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest
+      image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
       volumes:
         - ${{github.workspace}}:${{github.workspace}}    
     steps:
@@ -225,7 +225,7 @@ jobs:
   run_ubuntu_gcc_x86_64_riscv_fp16_cl3_0_unitcl_vecz:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest
+      image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
       volumes:
         - ${{github.workspace}}:${{github.workspace}}
     timeout-minutes: 60
@@ -258,7 +258,7 @@ jobs:
   run-ubuntu-clang-x86-llvm-latest-cl3-0-offline:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest
+      image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
       volumes:
         - ${{github.workspace}}:${{github.workspace}}    
     timeout-minutes: 90 # offline needs longer timeout
@@ -301,7 +301,7 @@ jobs:
   run-ubuntu-gcc-x86_64-riscv-fp16-cl3-0:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest
+      image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
       volumes:
         - ${{github.workspace}}:${{github.workspace}}    
     timeout-minutes: 60
@@ -336,7 +336,7 @@ jobs:
   run-ubuntu-gcc-x86-llvm-latest-x86_64-images-cl3-0-release:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest
+      image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
       volumes:
         - ${{github.workspace}}:${{github.workspace}}    
     timeout-minutes: 60
@@ -364,7 +364,7 @@ jobs:
   run-ubuntu-gcc-aarch64-llvm-latest-cl3-0-fp16:
     runs-on: cp-ubuntu-24.04
     container:
-      image: ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest
+      image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
       volumes:
         - ${{github.workspace}}:${{github.workspace}}
     timeout-minutes: 90 # aarch64 needs longer timeout
@@ -396,7 +396,7 @@ jobs:
   run-ubuntu-gcc-x86_64-clik-refsi:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest
+      image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
       volumes:
         - ${{github.workspace}}:${{github.workspace}}    
     timeout-minutes: 60
@@ -420,7 +420,7 @@ jobs:
     if: ${{ !inputs.is_pull_request }}  # do not run as PR job for now to avoid flooding the concurrency
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest
+      image: ghcr.io/uxlfoundation/ock_ubuntu_22.04-x86-64:latest
       volumes:
         - ${{github.workspace}}:${{github.workspace}}    
     timeout-minutes: 60

.github/workflows/run_pr_tests_caller.yml

@@ -1,19 +1,19 @@
 # Calling workflow for running PR style tests
 name: Run ock tests for PR style testing
 on:
-  pull_request:
-    paths:
-      - 'source/**'
-      - 'clik/**'
-      - 'modules/**'
-      - 'examples/**'
-      - 'cmake/**'
-      - 'hal/**'
-      - '.github/actions/do_build_ock/**'
-      - '.github/actions/setup_build/**'
-      - '.github/workflows/run_pr_tests.yml'
-      - '.github/workflows/run_pr_tests_caller.yml'
-      - 'CMakeLists.txt'
+  #pull_request:
+  #  paths:
+  #    - 'source/**'
+  #    - 'clik/**'
+  #    - 'modules/**'
+  #    - 'examples/**'
+  #    - 'cmake/**'
+  #    - 'hal/**'
+  #    - '.github/actions/do_build_ock/**'
+  #    - '.github/actions/setup_build/**'
+  #    - '.github/workflows/run_pr_tests.yml'
+  #    - '.github/workflows/run_pr_tests_caller.yml'
+  #    - 'CMakeLists.txt'
   schedule:
     # Run Mon-Fri at 7pm
     - cron: '00 19 * * 1-5'