CI planned_testing with dpcpp repo PR ref (#944)

Author: alan-forbes-cp

.github/actions/do_build_dpcpp/action.yml

@@ -12,6 +12,10 @@ inputs:
     description: 'save cache for build'
     type: boolean
     default: false
+  dpcpp_repo_pr_no:
+    description: 'dpc++ repo ref: enter PR number (else default branch is used)'
+    type: string
+    default: ""
 
 runs:
   using: "composite"
@@ -32,6 +36,17 @@ runs:
         repository: intel/llvm
         path: llvm
 
+    - name: merge PR ref (via temporary branch 'pr_branch') into default branch (sycl)
+      if: inputs.dpcpp_repo_pr_no != ''
+      shell: bash
+      run: |
+        cd llvm
+        git config user.email "[email protected]"
+        git config user.name "me"
+        git fetch origin --depth=2147483647 # deepen shallow repo clone
+        git fetch origin pull/${{ inputs.dpcpp_repo_pr_no }}/head:pr_branch
+        git merge pr_branch sycl
+
     - name: Setup ccache
       uses: hendrikmuhs/ccache-action@63069e3931dedbf3b63792097479563182fe70d1 # v1.2.18
       with:

.github/workflows/planned_testing_caller.yml

@@ -76,6 +76,10 @@ on:
       save_cache:
         type: boolean
         default: false
+      dpcpp_repo_pr_no:
+        description: 'dpc++ repo ref: enter PR number (else default branch is used)'
+        type: string
+        default: ""
 permissions:
   packages: read
 
@@ -109,6 +113,7 @@ jobs:
       native_cpu: ${{ inputs.native_cpu }}
       llvm_branch: ${{ inputs.llvm_branch }}
       save_cache: ${{ inputs.save_cache }}
+      dpcpp_repo_pr_no: ${{ inputs.dpcpp_repo_pr_no }}
 
       # The following can be used to download from a previous workflow run (change id)
       download_ock_artefact: ${{ inputs.download_ock_artefact }}

.github/workflows/planned_testing_caller_19.yml

@@ -7,6 +7,11 @@ on:
     # Run Sun, Wed at 7pm
     - cron: '0 19 * * 0,3'
   workflow_dispatch:
+    inputs:
+      dpcpp_repo_pr_no:
+        description: 'dpc++ repo ref: enter PR number (else default branch is used)'
+        type: string
+        default: ""
 
 permissions:
   packages: read
@@ -24,6 +29,7 @@ jobs:
       llvm_branch: 'release/19.x'
       use_llvm_github_cache: true
       save_cache:  ${{ github.event_name == 'schedule' }}
+      dpcpp_repo_pr_no:  ${{ inputs.dpcpp_repo_pr_no }}
       # We can set ock, test_sycl_cts etc here optionally if this is used as a pull request.
       # Any with parameters below this is intended for local testing and should not be merged.
       # target_list: '[ "host_x86_64_linux" ]'

.github/workflows/planned_testing_caller_20.yml

@@ -7,6 +7,11 @@ on:
     # Run Mon, Thu at 7pm
     - cron: '0 19 * * 1,4'
   workflow_dispatch:
+    inputs:
+      dpcpp_repo_pr_no:
+        description: 'dpc++ repo ref: enter PR number (else default branch is used)'
+        type: string
+        default: ""
 
 permissions:
   packages: read
@@ -32,6 +37,7 @@ jobs:
       llvm_branch: 'release/20.x'
       use_llvm_github_cache: true
       save_cache:  ${{ github.event_name == 'schedule' }}
+      dpcpp_repo_pr_no:  ${{ inputs.dpcpp_repo_pr_no }}
       # We can set ock, test_sycl_cts etc here optionally if this is used as a
       # pull request. Any parameters below this is intended for local testing
       # and should not be merged nor reviewed (other than checking it should not be merged).

.github/workflows/planned_testing_caller_21.yml

@@ -7,6 +7,11 @@ on:
     # Run Tue, Fri at 7pm
     - cron: '0 19 * * 2,5'
   workflow_dispatch:
+    inputs:
+      dpcpp_repo_pr_no:
+        description: 'dpc++ repo ref: enter PR number (else default branch is used)'
+        type: string
+        default: ""
 
 permissions:
   packages: read
@@ -31,6 +36,7 @@ jobs:
       llvm_version: '21'
       llvm_branch: 'release/21.x'
       save_cache:  ${{ github.event_name == 'schedule' }}
+      dpcpp_repo_pr_no:  ${{ inputs.dpcpp_repo_pr_no }}
       # We can set ock, test_sycl_cts etc here optionally if this is used as a
       # pull request. Any parameters below this is intended for local testing
       # and should not be merged nor reviewed (other than checking it should not be merged).

.github/workflows/run_ock_external_tests.yml

@@ -82,6 +82,11 @@ on:
         type: boolean
         description: 'save any caches required during building of any artefacts (usually on main only)'
         default: false
+      dpcpp_repo_pr_no:
+        required: false
+        type: string
+        description: 'dpc++ repo ref: enter PR number (else default branch is used)'
+        default: ""
 
 permissions:
   packages: read
@@ -421,6 +426,7 @@ jobs:
           target: host_x86_64_linux
           download_dpcpp_artefact: ${{ inputs.download_dpcpp_artefact }}
           save_cache: ${{ inputs.save_cache }}
+          dpcpp_repo_pr_no: ${{ inputs.dpcpp_repo_pr_no }}
 
   build_dpcpp_native_aarch64:
     needs: [workflow_vars]
@@ -445,6 +451,7 @@ jobs:
           target: host_aarch64_linux
           download_dpcpp_artefact: ${{ inputs.download_dpcpp_artefact }}
           save_cache: ${{ inputs.save_cache }}
+          dpcpp_repo_pr_no: ${{ inputs.dpcpp_repo_pr_no }}
 
   build_dpcpp_riscv64:
     needs: [workflow_vars, build_dpcpp_native_x86_64]  # cross builds need pre-built native artefact
@@ -475,6 +482,7 @@ jobs:
           target: ${{ matrix.target }}
           download_dpcpp_artefact: ${{ inputs.download_dpcpp_artefact }}
           save_cache: ${{ inputs.save_cache }}
+          dpcpp_repo_pr_no: ${{ inputs.dpcpp_repo_pr_no }}
 
   build_sycl_cts_x86_64_opencl:
     needs: [workflow_vars, build_icd, build_dpcpp_native_x86_64]