Added Xfail and Mayfail attributes to city runner

.github/actions/do_build_pr/run_host_x86_64/action.yml

@@ -0,0 +1,28 @@
+name: build_pr_host_x86_64
+description: Build pr host x86_64
+
+inputs:
+  cache_seed:
+    type: boolean
+    default: false
+
+runs:
+  using: "composite"
+  steps:
+      - name: remove any old dirs
+        shell: bash  
+        run:
+          rm -rf build build_offline
+      - name: build host x86_64 online release
+        uses: ./.github/actions/do_build_ock
+        with:
+          build_type: Release
+          offline_kernel_tests: ${{ inputs.cache_seed == 'true' && 'OFF' || 'ON' }}
+      - name: build host x86_64 offline release
+        uses: ./.github/actions/do_build_ock
+        with:
+          build_type: Release
+          extra_flags: -DCA_RUNTIME_COMPILER_ENABLED=OFF -DCA_EXTERNAL_CLC=${{ github.workspace }}/build/bin/clc
+          build_dir: build_offline
+          build_targets: UnitCL
+          assemble_spirv_ll_lit_test_offline: ${{ inputs.cache_seed == 'true' && 'OFF' || 'ON' }}

.github/actions/do_build_pr/run_riscv_m1/action.yml

@@ -0,0 +1,27 @@
+name: build_pr_riscv_m1
+description: Build pr riscv_m1
+
+inputs:
+  cache_seed:
+    type: boolean
+    default: false
+
+runs:
+  using: "composite"
+  steps:
+      - name: remove any old dirs
+        shell: bash  
+        run:
+          rm -rf build
+
+      - name: build_ock
+        uses: ./.github/actions/do_build_ock
+        with:
+          build_type: ${{ inputs.build_type }}
+          mux_targets_enable: riscv
+          mux_compilers_enable: refsi_m1
+          external_compiler_dirs: "${{ github.workspace }}/examples/refsi/refsi_m1/compiler/refsi_m1"
+          riscv_enabled: ON
+          enable_rvv_scalable_vecz_check: ON
+          enable_rvv_scalable_vp_vecz_check: ON
+          offline_kernel_tests: ${{ inputs.cache_seed == 'true' && 'OFF' || 'ON' }}

.github/actions/do_build_pr/run_ubuntu_clang_x86_llvm_latest_cl3_0_offline/action.yml

@@ -0,0 +1,42 @@
+name: build_pr_ubuntu_clang_x86_llvm_latest_cl3_0_offline
+description: Build pr ubuntu_clang_x86_llvm_latest_cl3_0_offline
+
+inputs:
+  cache_seed:
+    type: boolean
+    default: false
+
+runs:
+  using: "composite"
+  steps:
+      - name: remove any old dirs
+        shell: bash  
+        run:
+          rm -rf build build_offline install_offline
+
+      - name: build ock x86 relassert
+        uses: ./.github/actions/do_build_ock
+        with:
+          build_32_bit: ON
+          extra_flags: -DCMAKE_C_COMPILER=$GITHUB_WORKSPACE/llvm_install/bin/clang -DCMAKE_CXX_COMPILER=$GITHUB_WORKSPACE/llvm_install/bin/clang++
+          build_targets: ${{ inputs.cache_seed == 'true' && 'UnitCL clc' || 'check-ock' }}
+          enable_api: ""
+          builtin_kernel: ON
+          use_linker: gold
+          debug_support: ON
+          offline_kernel_tests: ${{ inputs.cache_seed == 'true' && 'OFF' || 'ON' }}
+
+      - name: build ock x86 offline
+        uses: ./.github/actions/do_build_ock
+        with:
+          build_32_bit: ON
+          extra_flags: -DCMAKE_C_COMPILER=$GITHUB_WORKSPACE/llvm_install/bin/clang -DCMAKE_CXX_COMPILER=$GITHUB_WORKSPACE/llvm_install/bin/clang++
+          build_targets:  ${{ inputs.cache_seed == 'true' && 'UnitCL' || 'check-ock' }}
+          runtime_compiler_enabled: OFF
+          assemble_spirv_ll_lit_test_offline: ${{ inputs.cache_seed == 'true' && 'OFF' || 'ON' }}
+          external_clc: ${GITHUB_WORKSPACE}/build/bin/clc
+          use_linker: gold
+          debug_support: ON
+          install_dir: $GITHUB_WORKSPACE/install_offline
+          build_dir: $GITHUB_WORKSPACE/build_offline
+          offline_kernel_tests: ${{ inputs.cache_seed == 'true' && 'OFF' || 'ON' }}

.github/actions/do_build_pr/run_ubuntu_gcc_aarch64_llvm_latest_cl3_0_fp16/action.yml

@@ -0,0 +1,27 @@
+name: build_ubuntu_gcc_aarch64_llvm_latest_cl3_0_fp16
+description: Build pr ubuntu_gcc_aarch64_llvm_latest_cl3_0_fp16
+
+inputs:
+  cache_seed:
+    type: boolean
+    default: false
+
+runs:
+  using: "composite"
+  steps:
+      - name: remove any old dirs
+        shell: bash  
+        run:
+          rm -rf build
+      - name: build ock
+        uses: ./.github/actions/do_build_ock
+        with:
+          build_targets: ${{ inputs.cache_seed == 'true' && 'UnitCL clc' || 'check-ock-cross' }} 
+          host_fp16: ON
+          use_linker: gold
+          debug_support: ON
+          builtin_kernel: ON
+          enable_api: ""
+          toolchain_file: "scripts/../platform/arm-linux/aarch64-toolchain.cmake"
+          extra_flags: -DCA_BUILTINS_TOOLS_DIR=${{ github.workspace }}/llvm_install_native/bin
+          offline_kernel_tests: ${{ inputs.cache_seed == 'true' && 'OFF' || 'ON' }}

.github/actions/do_build_pr/run_ubuntu_gcc_x86_64_refsi_g1_wi_cl3_0/action.yml

@@ -0,0 +1,32 @@
+name: build_pr_ubuntu_gcc_x86_64_refsi_g1_wi_cl3_0
+description: Build pr ubuntu_gcc_x86_64_refsi_g1_wi_cl3_0
+
+inputs:
+  cache_seed:
+    type: boolean
+    default: false
+
+runs:
+  using: "composite"
+  steps:
+      - name: remove any old dirs
+        shell: bash  
+        run:
+          rm -rf build
+      - name: build ock
+        uses: ./.github/actions/do_build_ock
+        with:
+          build_targets: install # Build the install target so we don't miss compilation errors
+          mux_targets_enable: riscv
+          external_compiler_dirs: ${{ github.workspace }}/examples/refsi/refsi_g1_wi/compiler/refsi_g1_wi
+          mux_compilers_enable: refsi_g1_wi
+          riscv_enabled: ON
+          disable_unitcl_vecz_checks: ON
+          enable_rvv_scalable_vecz_check: ON
+          enable_rvv_scalable_vp_vecz_check: ON
+          use_linker: gold
+          hal_description: RV64GCV
+          hal_refsi_soc: G1
+          hal_refsi_thread_mode: WI
+          debug_support: ON
+          offline_kernel_tests: ${{ inputs.cache_seed == 'true' && 'OFF' || 'ON' }} 

.github/actions/do_build_pr/run_ubuntu_gcc_x86_64_riscv_fp16_cl3_0/action.yml

@@ -0,0 +1,33 @@
+name: build_pr_ubuntu_gcc_x86_64_riscv_fp16_cl3-0
+description: Build pr ubuntu_gcc_x86_64_riscv_fp16_cl3-0
+
+inputs:
+  cache_seed:
+    type: boolean
+    default: false
+
+runs:
+  using: "composite"
+  steps:
+      - name: remove any old dirs
+        shell: bash  
+        run:
+          rm -rf build
+
+      - name: build ock
+        uses: ./.github/actions/do_build_ock
+        with:
+          build_targets: ${{ inputs.cache_seed == 'true' && 'UnitCL clc' || 'check-ock' }}
+          mux_targets_enable: riscv
+          mux_compilers_enable: riscv
+          riscv_enabled: ON
+          disable_unitcl_vecz_checks: ON
+          enable_rvv_scalable_vecz_check: ON
+          enable_rvv_scalable_vp_vecz_check: ON
+          host_enable_builtins: OFF
+          use_linker: gold
+          hal_description: RV64GCV_Zfh
+          hal_refsi_soc: G1
+          hal_refsi_thread_mode: WG
+          debug_support: ON
+          offline_kernel_tests: ${{ inputs.cache_seed == 'true' && 'OFF' || 'ON' }}        

.github/actions/do_build_pr/run_ubuntu_gcc_x86_64_riscv_fp16_cl3_0_unitcl_vecz/action.yml

@@ -0,0 +1,31 @@
+name: build_pr_ubuntu_gcc_x86_64_riscv_fp16_cl3_0_unitcl_vecz
+description: Build pr ubuntu_gcc_x86_64_riscv_fp16_cl3_0_unitcl_vecz
+
+inputs:
+  cache_seed:
+    type: boolean
+    default: false
+
+runs:
+  using: "composite"
+  steps:
+      - name: remove any old dirs
+        shell: bash  
+        run:
+          rm -rf build
+
+      - name: build ock
+        uses: ./.github/actions/do_build_ock
+        with:
+          build_targets: ${{ inputs.cache_seed == 'true' && 'clc UnitCL' || 'check-ock-UnitCL-group-vecz' }}
+          mux_targets_enable: riscv
+          mux_compilers_enable: riscv
+          riscv_enabled: ON
+          enable_rvv_scalable_vecz_check: ON
+          enable_rvv_scalable_vp_vecz_check: ON
+          use_linker: gold
+          hal_description: RV64GCV_Zfh
+          hal_refsi_soc: G1
+          hal_refsi_thread_mode: WG
+          debug_support: ON
+          offline_kernel_tests: ${{ inputs.cache_seed == 'true' && 'OFF' || 'ON' }}

.github/actions/do_build_pr/run_ubuntu_gcc_x86_llvm_latest_x86_64_images_cl3_0_release/action.yml

@@ -0,0 +1,26 @@
+name: build_pr_ubuntu_gcc_x86_llvm_latest_x86_64_images_cl3_0_release
+description: Build pr ubuntu_gcc_x86_llvm_latest_x86_64_images_cl3_0_release
+
+inputs:
+  cache_seed:
+    type: boolean
+    default: false
+
+runs:
+  using: "composite"
+  steps:
+      - name: remove any old dirs
+        shell: bash  
+        run:
+          rm -rf build
+
+      - name: build ock
+        uses: ./.github/actions/do_build_ock
+        with:
+          build_type: Release
+          build_targets: ${{ inputs.cache_seed == 'true' && 'UnitCL clc' || 'check-ock' }}
+          host_image: ON
+          use_linker: gold
+          enable_api: ""
+          builtin_kernel: ON
+          offline_kernel_tests: ${{ inputs.cache_seed == 'true' && 'OFF' || 'ON' }}

.github/actions/do_build_pr/run_windows_msvc_x86_64_llvm_latest_cl3_0_offline/action.yml

@@ -0,0 +1,43 @@
+name: build_pr_windows_msvc_x86_64_llvm_latest_cl3_0_offline
+description: Build pr windows_msvc_x86_64_llvm_latest_cl3_0_offline
+
+inputs:
+  cache_seed:
+    type: boolean
+    default: false
+  pull_request:
+    type: boolean
+    default: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: remove any old dirs
+      shell: bash  
+      run:
+        rm -rf build build_offline install_offline
+
+    - name: build ock x86_64
+      uses: ./.github/actions/do_build_ock
+      with:
+        build_targets: ${{ inputs.cache_seed == 'true' && 'UnitCL clc' || 'check-ock' }}
+        enable_api: ""
+        builtin_kernel: ON
+        shell_to_use: pwsh
+        gtest_launcher: "python3;-u;${{ github.workspace }}/scripts/gtest-terse-runner.py"
+        debug_support: ON
+        enable_unitcl_expensive: ${{ !inputs.is_pull_request && 'ON' || 'OFF' }}
+        offline_kernel_tests: ${{ inputs.cache_seed == 'true' && 'OFF' || 'ON' }}
+
+    - name: build ock x86_64 offline
+      uses: ./.github/actions/do_build_ock
+      with:
+        build_targets: ${{ inputs.cache_seed == 'true' && 'UnitCL' || 'check-ock' }}
+        runtime_compiler_enabled: OFF
+        external_clc: "${{ github.workspace }}/build/bin/clc.exe"
+        shell_to_use: pwsh
+        gtest_launcher: "python3;-u;${{ github.workspace }}/scripts/gtest-terse-runner.py"
+        debug_support: ON
+        install_dir: ${{ github.workspace }}/install_offline
+        build_dir: ${{ github.workspace }}/build_offline
+        offline_kernel_tests: ${{ inputs.cache_seed == 'true' && 'OFF' || 'ON' }}

.github/actions/run_opencl_cts/action.yml

@@ -34,11 +34,16 @@ runs:
         fi
         echo QEMU SETTING: $QEMU_SETTING
         set -x
-        echo > expect_fail.csv
+        # Build override file, all is done first, then the target specific.
+        # The last file can overwrite previous overrides.        
+        for csv in .github/opencl_cts/override_all.csv .github/opencl_cts/override_${{ inputs.target }}.csv
+        do
+           [ -f $csv ] && cat $csv >> override.csv
+        done > override.csv
+        echo override file:
+        cat override.csv
+
         # $CTS_FILTER ignores certain test, so is treated differently to temporary fails.
-        [ -f .github/opencl_cts/expect_fail_all.csv ] && cat .github/opencl_cts/expect_fail_all.csv >> expect_fail.csv
-        [ -f .github/opencl_cts/expect_fail_${{ inputs.target }}.csv ] && cat .github/opencl_cts/expect_fail_${{ inputs.target }}.csv >> expect_fail.csv
-        cat expect_fail.csv "$GITHUB_WORKSPACE/source/cl/scripts/$CTS_FILTER" > disable.csv 
         # Note: use 'eval' built-in to handle quoting/escaping/splitting reqs
         RUN_CITIES="python3 -u $GITHUB_WORKSPACE/scripts/testing/run_cities.py -v \
           --color=always --timeout $CTS_TIMEOUT \
@@ -49,23 +54,6 @@ runs:
           -e OCL_ICD_FILENAMES=$GITHUB_WORKSPACE/install_ock/lib/libCL.so \
           -e CL_PLATFORM_INDEX=0 \
           -s $GITHUB_WORKSPACE/test_conformance/$CTS_CSV_FILE \
-          -i disable.csv"
+          -i $GITHUB_WORKSPACE/source/cl/scripts/$CTS_FILTER \
+          -o override.csv"
         eval $RUN_CITIES
-
-    - name: Run expected failed opencl cts
-      shell: bash
-      env:
-        CTS_TIMEOUT: 18:00:00
-      run: |
-        echo "Running OpenCL CTS tests with CTS file $CTS_CSV_FILE with filter $CTS_FILTER"
-        set -x
-        RUN_CITIES="python3 -u $GITHUB_WORKSPACE/scripts/testing/run_cities.py -v \
-          --color=always --timeout $CTS_TIMEOUT \
-          $QEMU_SETTING \
-          -b $GITHUB_WORKSPACE/test_conformance \
-          -L $GITHUB_WORKSPACE/install_icd/lib \
-          -e CLC_EXECUTABLE=$GITHUB_WORKSPACE/install_ock/bin/clc \
-          -e OCL_ICD_FILENAMES=$GITHUB_WORKSPACE/install_ock/lib/libCL.so \
-          -e CL_PLATFORM_INDEX=0 \
-          -s expect_fail.csv"
-        eval $RUN_CITIES || echo failed as expected