Add riscv64 support to pre-req jobs

uxlfoundation · Jan 14, 2025 · bb7bd69 · bb7bd69
1 parent 4edf347
commit bb7bd69
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/create_llvm.yml b/.github/workflows/create_llvm.yml
@@ -6,9 +6,9 @@ on:
       - main
     paths:
       - '.github/workflows/create_llvm.yml'
-  pull_request:
-    paths:
-      - '.github/workflows/create_llvm.yml'
+  #pull_request:
+  #  paths:
+  #    - '.github/workflows/create_llvm.yml'
   schedule:
     # Run Mon-Fri at 5pm
     - cron: '00 17 * * 1-5'      

diff --git a/.github/workflows/planned_testing.yml b/.github/workflows/planned_testing.yml
@@ -38,15 +38,15 @@ jobs:
   workflow_vars:
     runs-on: ubuntu-22.04
     outputs:
-      matrix_only_linux_x86_64_aarch64: ${{ steps.vars.outputs.matrix_only_linux_x86_64_aarch64 }}
+      matrix_only_linux_x86_64_aarch64_riscv64: ${{ steps.vars.outputs.matrix_only_linux_x86_64_aarch64_riscv64 }}
       matrix_only_linux_x86_64: ${{ steps.vars.outputs.matrix_only_linux_x86_64 }}
     steps:
     - 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
       run: |
-        echo matrix_only_linux_x86_64_aarch64="[ {\"target\": \"host_arm_linux\"}, {\"target\": \"host_riscv64_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    
 
@@ -76,7 +76,7 @@ jobs:
       fail-fast: false  # let all matrix jobs complete
       matrix:
         target: ${{ fromJson(inputs.target_list) }}
-        exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64) }}
+        exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64_riscv64) }}
 
     # risc-v needs ubuntu 24.04 so we get the latest qemu as well as how we
     # build llvm. Otherwise we choose ubuntu-22.04 (use a container for both for consistency).
@@ -103,9 +103,9 @@ jobs:
       fail-fast: false  # let all matrix jobs complete
       matrix:
         target: ${{ fromJson(inputs.target_list) }}
-        exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64) }}
+        exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64_riscv64) }}
 
-    runs-on: ubuntu-22.04
+    runs-on: ${{ contains(matrix.target, 'host_riscv') && 'ubuntu-24.04' || 'ubuntu-22.04' }}
     steps:
       - name: clone ock platform
         uses: actions/checkout@v4
@@ -128,7 +128,7 @@ jobs:
         target: ${{ fromJson(inputs.target_list) }}
         exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64) }}
 
-    # Todo: expand for aarch64
+    # Todo: expand for aarch64 and riscv64
     runs-on: ubuntu-22.04
     steps:
       - name: clone ock platform
@@ -154,7 +154,7 @@ jobs:
       fail-fast: false  # let all matrix jobs complete
       matrix:
         target: ${{ fromJson(inputs.target_list) }}
-        exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64) }}
+        exclude: ${{ fromJson(needs.workflow_vars.outputs.matrix_only_linux_x86_64_aarch64_risc64) }}
 
     # TODO: host-x86_64-linux only - expand for other targets
     runs-on: cp-ubuntu-24.04

diff --git a/.github/workflows/planned_testing_caller.yml b/.github/workflows/planned_testing_caller.yml
@@ -23,10 +23,11 @@ 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_x86_64_linux", "host_aarch64_linux", "host_riscv64_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