[CI] Unify check-* in Build/LIT task between Linux/Windows

aelovikov-intel · aelovikov-intel · commit e5d01590e578 · 2023-06-07T09:53:03.000-07:00
diff --git a/.github/workflows/sycl_detect_changes.yml b/.github/workflows/sycl_detect_changes.yml
@@ -0,0 +1,50 @@
+name: Identify impacted LIT tests
+# Outlined into a separate reusable workflow to ease testing for new rules.
+
+on:
+  workflow_call:
+    outputs:
+      filters:
+        description: Matched filters
+        value: ${{ jobs.need_check.outputs.filters }}
+
+jobs:
+  need_check:
+    name: Decide which tests could be affected by the changes
+    # Github's ubuntu-* runners are slow to allocate. Use our CUDA runner since
+    # we don't use it for anything right now.
+    runs-on: cuda
+    timeout-minutes: 3
+    outputs:
+      filters: ${{ steps.changes.outputs.changes }}
+    steps:
+      - name: Check file changes
+        uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50
+        id: changes
+        with:
+          filters: |
+            llvm: &llvm
+              - 'llvm/**'
+            llvm_spirv: &llvm_spirv
+              - *llvm
+              - 'llvm-spirv/**'
+            clang: &clang
+              - *llvm
+              - 'clang/**'
+            sycl_fusion: &sycl-fusion
+              - *llvm
+              - 'sycl-fusion/**'
+            xptifw: &xptifw
+              - 'xptifw/**'
+            libclc: &libclc
+              - *llvm_spirv
+              - *clang
+              - 'libclc/**'
+            sycl:
+              - *clang
+              - *sycl-fusion
+              - *llvm_spirv
+              - *xptifw
+              - *libclc
+              - 'sycl/*'
+              - 'sycl/!(test-e2e)/**'
diff --git a/.github/workflows/sycl_linux_build_and_test.yml b/.github/workflows/sycl_linux_build_and_test.yml
@@ -64,34 +64,11 @@ on:
         type: string
         required: false
         default: 'SYCL-2020'
-      check_llvm:
+      check_filters:
         type: string
+        description: 'Filter matches for the changed files in the PR'
+        default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
         required: false
-        default: 'true'
-      check_clang:
-        type: string
-        required: false
-        default: 'true'
-      check_sycl:
-        type: string
-        required: false
-        default: 'true'
-      check_llvm_spirv:
-        type: string
-        required: false
-        default: 'true'
-      check_xptifw:
-        type: string
-        required: false
-        default: 'true'
-      check_libclc:
-        type: string
-        required: false
-        default: 'true'
-      check_libdevice:
-        type: string
-        required: false
-        default: 'true'
 
 jobs:
   build:
@@ -136,38 +113,11 @@ jobs:
     - name: Compile
       id: build
       run: cmake --build $GITHUB_WORKSPACE/build
-    # TODO allow to optionally disable in-tree checks
-    - name: check-llvm
-      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' && inputs.check_llvm == 'true' }}
-      run: |
-        cmake --build $GITHUB_WORKSPACE/build --target check-llvm
-    - name: check-clang
-      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' && inputs.check_clang == 'true' }}
-      run: |
-        export XDG_CACHE_HOME=$GITHUB_WORKSPACE/os_cache
-        cmake --build $GITHUB_WORKSPACE/build --target check-clang
-    - name: check-sycl
-      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' && inputs.check_sycl == 'true' }}
-      run: |
-        # TODO consider moving this to Dockerfile
-        export LD_LIBRARY_PATH=/usr/local/cuda/compat/:/usr/local/cuda/lib64:$LD_LIBRARY_PATH
-        cmake --build $GITHUB_WORKSPACE/build --target check-sycl
-    - name: check-llvm-spirv
-      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' && inputs.check_llvm_spirv == 'true' }}
-      run: |
-        cmake --build $GITHUB_WORKSPACE/build --target check-llvm-spirv
-    - name: check-xptifw
-      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' && inputs.check_xptifw == 'true' }}
-      run: |
-        cmake --build $GITHUB_WORKSPACE/build --target check-xptifw
-    - name: check-libclc
-      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' && inputs.check_libclc == 'true' }}
-      run: |
-        cmake --build $GITHUB_WORKSPACE/build --target check-libclc
-    - name: check-libdevice
-      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' && inputs.check_libdevice == 'true' }}
-      run: |
-        cmake --build $GITHUB_WORKSPACE/build --target check-libdevice
+    - name: LIT tests
+      uses: ./src/devops/actions/lit-tests
+      with:
+        build_path: "$GITHUB_WORKSPACE/build"
+        filters: ${{ inputs.check_filters }}
     - name: Install
       # TODO replace utility installation with a single CMake target
       run: |
diff --git a/.github/workflows/sycl_precommit.yml b/.github/workflows/sycl_precommit.yml
@@ -27,53 +27,8 @@ permissions:
   contents: read
 
 jobs:
-  need_check:
-    name: Decide which tests could be affected by the changes
-    runs-on: ubuntu-22.04
-    timeout-minutes: 3
-    outputs:
-      llvm: ${{ steps.changes.outputs.llvm == 'true' }}
-      llvm_spirv: ${{ steps.changes.outputs.llvm_spirv == 'true' }}
-      clang: ${{ steps.changes.outputs.clang == 'true' }}
-      xptifw: ${{ steps.changes.outputs.xptifw == 'true' }}
-      libclc: ${{ steps.changes.outputs.libclc == 'true' }}
-      sycl: ${{ steps.changes.outputs.sycl == 'true' }}
-    steps:
-      - name: Check file changes
-        uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50
-        id: changes
-        with:
-          filters: |
-            llvm: &llvm
-              - 'llvm/**'
-            llvm_spirv: &llvm_spirv
-              - *llvm
-              - 'llvm-spirv/**'
-            clang: &clang
-              - *llvm
-              - 'clang/**'
-            sycl_fusion: &sycl-fusion
-              - *llvm
-              - 'sycl-fusion/**'
-            xptifw: &xptifw
-              - 'xptifw/**'
-            libclc: &libclc
-              - *llvm_spirv
-              - *clang
-              - 'libclc/**'
-            libdevice: &libdevice
-              - *llvm_spirv
-              - *clang
-              - 'libdevice/**'
-            sycl:
-              - *clang
-              - *sycl-fusion
-              - *llvm_spirv
-              - *xptifw
-              - *libclc
-              - *libdevice
-              - 'sycl/*'
-              - 'sycl/!(test-e2e)/**'
+  detect_changes:
+    uses: ./.github/workflows/sycl_detect_changes.yml
 
   lint:
     runs-on: ubuntu-22.04
@@ -102,7 +57,7 @@ jobs:
     name: Linux
     # Only build and test patches, that have passed all linter checks, because
     # the next commit is likely to be a follow-up on that job.
-    needs: [lint, test_matrix, need_check]
+    needs: [lint, test_matrix, detect_changes]
     if: always() && (success() || contains(github.event.pull_request.labels.*.name, 'ignore-lint'))
     uses: ./.github/workflows/sycl_linux_build_and_test.yml
     secrets: inherit
@@ -114,24 +69,14 @@ jobs:
       build_cache_suffix: "default"
       lts_matrix: ${{ needs.test_matrix.outputs.lts_lx_matrix }}
       lts_aws_matrix: ${{ needs.test_matrix.outputs.lts_aws_matrix }}
-      check_llvm: ${{ needs.need_check.outputs.llvm }}
-      check_llvm_spirv: ${{ needs.need_check.outputs.llvm_spirv }}
-      check_clang: ${{ needs.need_check.outputs.clang }}
-      check_xptifw: ${{ needs.need_check.outputs.xptifw }}
-      check_libclc: ${{ needs.need_check.outputs.libclc }}
-      check_sycl: ${{ needs.need_check.outputs.sycl }}
+      check_filters: ${{ needs.detect_changes.outputs.filters }}
 
   windows_default:
     name: Windows
-    needs: [lint, test_matrix, need_check]
+    needs: [lint, test_matrix, detect_changes]
     if: github.repository == 'intel/llvm'
     uses: ./.github/workflows/sycl_windows_build_and_test.yml
     with:
       lts_matrix: ${{ needs.test_matrix.outputs.lts_wn_matrix }}
       build_ref: ${{ github.event.pull_request.head.sha }}
-      check_llvm: ${{ needs.need_check.outputs.llvm }}
-      check_llvm_spirv: ${{ needs.need_check.outputs.llvm_spirv }}
-      check_clang: ${{ needs.need_check.outputs.clang }}
-      check_xptifw: ${{ needs.need_check.outputs.xptifw }}
-      check_libclc: ${{ needs.need_check.outputs.libclc }}
-      check_sycl: ${{ needs.need_check.outputs.sycl }}
+      check_filters: ${{ needs.detect_changes.outputs.filters }}
diff --git a/.github/workflows/sycl_windows_build_and_test.yml b/.github/workflows/sycl_windows_build_and_test.yml
@@ -18,34 +18,11 @@ on:
         type: string
         required: false
         default: ""
-      check_llvm:
+      check_filters:
         type: string
+        description: 'Filter matches for the changed files in the PR'
+        default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
         required: false
-        default: 'true'
-      check_clang:
-        type: string
-        required: false
-        default: 'true'
-      check_sycl:
-        type: string
-        required: false
-        default: 'true'
-      check_llvm_spirv:
-        type: string
-        required: false
-        default: 'true'
-      check_xptifw:
-        type: string
-        required: false
-        default: 'true'
-      check_libclc:
-        type: string
-        required: false
-        default: 'true'
-      check_libdevice:
-        type: string
-        required: false
-        default: 'true'
 
 jobs:
   build:
@@ -93,36 +70,13 @@ jobs:
       shell: bash
       run: |
         cmake --build build --target sycl-toolchain
-    - name: check-llvm
-      shell: bash
-      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' && inputs.check_llvm == 'true' }}
-      run: |
-        cmake --build build --target check-llvm
-    - name: check-clang
-      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' && inputs.check_clang == 'true' }}
-      shell: bash
-      run: |
-        cmake --build build --target check-clang
-    - name: check-sycl
-      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' && inputs.check_sycl == 'true' }}
-      shell: bash
-      run: |
-        cmake --build build --target check-sycl
-    - name: check-llvm-spirv
-      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' && inputs.check_llvm_spirv == 'true' }}
-      shell: bash
-      run: |
-        cmake --build build --target check-llvm-spirv
-    - name: check-xptifw
-      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' && inputs.check_xptifw == 'true' }}
-      shell: bash
-      run: |
-        cmake --build build --target check-xptifw
-    - name: check-libdevice
-      if: ${{ always() && !cancelled() && steps.build.outcome == 'success' && inputs.check_libdevice == 'true' }}
-      shell: bash
-      run: |
-        cmake --build build --target check-libdevice
+    - name: LIT tests
+      uses: ./src/devops/actions/lit-tests
+      with:
+        build_path: build
+        filters: ${{ inputs.check_filters }}
+        # TODO: Enable CUDA/HIP testing on Windows?
+        skip_targets: '[libclc]'
     - name: Install
       shell: bash
       # TODO replace utility installation with a single CMake target
diff --git a/devops/actions/lit-tests/action.yml b/devops/actions/lit-tests/action.yml
@@ -0,0 +1,81 @@
+name: Device-agnostic LIT tests
+inputs:
+  filters:
+    description: 'Filter matches for the changed files in the PR'
+    # TODO: If that is used by a re-usable workflow, then the caller has to
+    # provide the same defaults explicitly in its inputs. Make sure those are
+    # modified whenever changes are being made here.
+    default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
+    required: false
+  skip_targets:
+    description: 'Checks to skip'
+    default: '[]'
+    required: false
+  build_path:
+    description: 'Path to the build directory'
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: check-llvm
+      shell: bash
+      if: |
+        always() && !cancelled()
+        && contains(inputs.filters, 'llvm')
+        && !contains(inputs.skip_targets, 'llvm')
+      run: |
+        cmake --build ${{ inputs.build_path }} --target check-llvm
+    - name: check-clang
+      shell: bash
+      if: |
+        always() && !cancelled()
+        && contains(inputs.filters, 'clang')
+        && !contains(inputs.skip_targets, 'clang')
+      run: |
+        # Can we move this to Dockerfile? Hopefully, noop on Windows.
+        export XDG_CACHE_HOME=$GITHUB_WORKSPACE/os_cache
+        cmake --build ${{ inputs.build_path }} --target check-clang
+    - name: check-sycl
+      shell: bash
+      if: |
+        always() && !cancelled()
+        && contains(inputs.filters, 'sycl')
+        && !contains(inputs.skip_targets, 'sycl')
+      run: |
+        # TODO consider moving this to Dockerfile.
+        # Will be ignored on Windows even when executed.
+        export LD_LIBRARY_PATH=/usr/local/cuda/compat/:/usr/local/cuda/lib64:$LD_LIBRARY_PATH
+        cmake --build ${{ inputs.build_path }} --target check-sycl
+    - name: check-llvm-spirv
+      shell: bash
+      if: |
+        always() && !cancelled()
+        && contains(inputs.filters, 'llvm_spirv')
+        && !contains(inputs.skip_targets, 'llvm_spirv')
+      run: |
+        cmake --build ${{ inputs.build_path }} --target check-llvm-spirv
+    - name: check-xptifw
+      shell: bash
+      if: |
+        always() && !cancelled()
+        && contains(inputs.filters, 'xptifw')
+        && !contains(inputs.skip_targets, 'xptifw')
+      run: |
+        cmake --build ${{ inputs.build_path }} --target check-xptifw
+    - name: check-libclc
+      shell: bash
+      if: |
+        always() && !cancelled()
+        && contains(inputs.filters, 'libclc')
+        && !contains(inputs.skip_targets, 'libclc')
+      run: |
+        cmake --build ${{ inputs.build_path }} --target check-libclc
+    - name: check-libdevice
+      shell: bash
+      if: |
+        always() && !cancelled()
+        && contains(inputs.filters, 'libdevice')
+        && !contains(inputs.skip_targets, 'libdevice')
+      run: |
+        cmake --build ${{ inputs.build_path }} --target check-libdevice
