Skip to content

Commit ff97279

Browse files
author
Colin Davidson
committed
Update to llvm 19/20 being the supported versions
We are now officially dropping 18. This updates the documentation and PR testing to match. The default for run_ock_internal_tests.yml has been dropped. This needs to be set at the higher level of run_pr_tests_caller.yml or planned_testing_caller.yml. Fixed windows job for run_internal_test.yml to not run on a pull request. Remove create_llvm workflow as this is no longer needed.
1 parent 1a2188f commit ff97279

File tree

7 files changed

+19
-180
lines changed

7 files changed

+19
-180
lines changed

.github/workflows/create_llvm.yml

Lines changed: 0 additions & 171 deletions
This file was deleted.

.github/workflows/docs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ on:
1515
# Allows you to run this workflow manually from the Actions tab
1616
workflow_dispatch:
1717

18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
20+
cancel-in-progress: true
21+
1822
permissions: {}
1923

2024
jobs:

.github/workflows/run_ock_internal_tests.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,13 @@ on:
1313
type: string
1414
default: 'install'
1515
llvm_previous:
16-
required: false
16+
required: true
1717
type: string
1818
description: 'previous llvm version to for those jobs tied to previous.'
19-
default: '18'
2019
llvm_current:
21-
required: false
20+
required: true
2221
type: string
2322
description: 'previous llvm version to for those jobs tied to current.'
24-
default: '19'
2523
github_token:
2624
type: string
2725
description: 'gh token for downloading artifacts - only needed if we want llvm from a previous workflow'
@@ -203,7 +201,7 @@ jobs:
203201
run_windows_msvc_x86_64_llvm_latest_cl3_0_offline:
204202
runs-on: windows-2019
205203
# do not run as PR job due to not yet supporting windows install
206-
if: contains(inputs.target_list, 'host_x86_64_windows') && inputs.is_pull_request != 'true'
204+
if: contains(inputs.target_list, 'host_x86_64_windows') && !inputs.is_pull_request
207205
steps:
208206
- name: Setup Windows llvm base
209207
uses: llvm/actions/setup-windows@main

.github/workflows/run_pr_tests_caller.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,7 @@ jobs:
2626
with:
2727
is_pull_request: true
2828
llvm_source: install
29+
llvm_previous: 19
30+
llvm_current: 20
31+
2932

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@
22

33
## TBD
44

5+
Feature additions:
6+
7+
* Support for LLVM 20 has been added.
8+
59
Upgrade guidance:
610

711
* Support for degenerate subgroups has been removed. No in-tree target or
812
template was using this, but custom targets may need to be updated.
13+
* Support for LLVM versions before 19 has been removed.
914

1015
## Version 4.0.0
1116

cmake/ImportLLVM.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ include(DetectLLVMMSVCCRT)
5757
:cmake:variable:`LLVM_PACKAGE_VERSION` from the imported LLVM install is
5858
a supported version.
5959
#]=======================================================================]
60-
set(CA_LLVM_MINIMUM_VERSION 18.0.0)
61-
set(CA_LLVM_MAXIMUM_VERSION 19)
60+
set(CA_LLVM_MINIMUM_VERSION 19.0.0)
61+
set(CA_LLVM_MAXIMUM_VERSION 20)
6262
string(REPLACE ";" "', '" CA_LLVM_VERSIONS_PRETTY "${CA_LLVM_VERSIONS}")
6363
if("${LLVM_PACKAGE_VERSION}" VERSION_LESS "${CA_LLVM_MINIMUM_VERSION}")
6464
message(FATAL_ERROR

doc/overview/compiler/supported-llvm-versions.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ All targets
88

99
.. rubric:: Supported - tested regularly
1010

11-
- 18.1.8+
12-
- 19.1.2+
11+
- 19.1.7+
12+
- 20.1.2+

0 commit comments

Comments
 (0)