Skip to content

Commit df4cdfe

Browse files
authored
Remove now unnecessary use of --cmake-opt from CI (#17421)
Since ae76189 we can now pass `-D` options to cmake through the configure wrapper scripts without needing the `--cmake-opt` flag. This makes these definitions a little more succinct and easier to read.
1 parent 357e9e0 commit df4cdfe

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

.github/workflows/coverity.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ jobs:
4646
python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
4747
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
4848
--ci-defaults --hip --cuda \
49-
--cmake-opt="-DNATIVECPU_USE_OCK=Off" \
50-
--cmake-opt="-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV"
49+
-DNATIVECPU_USE_OCK=Off \
50+
-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV
5151
5252
- name: Build with coverity
5353
run: $GITHUB_WORKSPACE/cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build $GITHUB_WORKSPACE/build --target sycl-toolchain

.github/workflows/sycl-linux-build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,11 @@ jobs:
163163
python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
164164
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
165165
--ci-defaults ${{ inputs.build_configure_extra_args }} \
166-
--cmake-opt=-DCMAKE_C_COMPILER_LAUNCHER=ccache \
167-
--cmake-opt=-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
168-
--cmake-opt="-DLLVM_INSTALL_UTILS=ON" \
169-
--cmake-opt="-DNATIVECPU_USE_OCK=Off" \
170-
--cmake-opt="-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV" \
166+
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
167+
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
168+
-DLLVM_INSTALL_UTILS=ON \
169+
-DNATIVECPU_USE_OCK=Off \
170+
-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV \
171171
--level_zero_v1_and_v2
172172
- name: Compile
173173
id: build

.github/workflows/sycl-macos-build-and-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ jobs:
5050
python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
5151
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
5252
--ci-defaults $ARGS \
53-
--cmake-opt=-DCMAKE_C_COMPILER_LAUNCHER=ccache \
54-
--cmake-opt=-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
55-
--cmake-opt="-DLLVM_INSTALL_UTILS=ON"
53+
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
54+
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
55+
-DLLVM_INSTALL_UTILS=ON
5656
- name: Compile
5757
run: cmake --build $GITHUB_WORKSPACE/build --target deploy-sycl-toolchain

.github/workflows/sycl-nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
build_cache_root: "/__w/"
4444
build_cache_suffix: oneapi
4545
build_artifact_suffix: oneapi
46-
build_configure_extra_args: --cmake-opt=-DCMAKE_C_FLAGS="-no-intel-lib -ffp-model=precise" --cmake-opt=-DCMAKE_CXX_FLAGS="-no-intel-lib -ffp-model=precise"
46+
build_configure_extra_args: -DCMAKE_C_FLAGS="-no-intel-lib -ffp-model=precise" -DCMAKE_CXX_FLAGS="-no-intel-lib -ffp-model=precise"
4747
cc: icx
4848
cxx: icpx
4949

.github/workflows/sycl-post-commit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
build_cache_root: "/__w/llvm"
3838
build_cache_suffix: default
3939
build_artifact_suffix: default
40-
build_configure_extra_args: --no-assertions --hip --cuda --native_cpu --cmake-opt="-DSYCL_ENABLE_STACK_PRINTING=ON" --cmake-opt="-DSYCL_LIB_WITH_DEBUG_SYMBOL=ON"
40+
build_configure_extra_args: --no-assertions --hip --cuda --native_cpu -DSYCL_ENABLE_STACK_PRINTING=ON -DSYCL_LIB_WITH_DEBUG_SYMBOL=ON
4141

4242
e2e-lin:
4343
needs: [build-lin]
@@ -102,7 +102,7 @@ jobs:
102102
uses: ./.github/workflows/sycl-windows-build.yml
103103
with:
104104
compiler: icx
105-
build_configure_extra_args: --cmake-opt=-DCMAKE_C_FLAGS="/fp:precise /clang:-Wno-nonportable-include-path /clang:-Wno-cast-function-type-mismatch" --cmake-opt=-DCMAKE_CXX_FLAGS="/fp:precise /clang:-Wno-nonportable-include-path /clang:-Wno-cast-function-type-mismatch" --cmake-opt="-DCMAKE_EXE_LINKER_FLAGS=/manifest:no" --cmake-opt="-DCMAKE_MODULE_LINKER_FLAGS=/manifest:no" --cmake-opt="-DCMAKE_SHARED_LINKER_FLAGS=/manifest:no"
105+
build_configure_extra_args: -DCMAKE_C_FLAGS="/fp:precise /clang:-Wno-nonportable-include-path /clang:-Wno-cast-function-type-mismatch" -DCMAKE_CXX_FLAGS="/fp:precise /clang:-Wno-nonportable-include-path /clang:-Wno-cast-function-type-mismatch" -DCMAKE_EXE_LINKER_FLAGS=/manifest:no -DCMAKE_MODULE_LINKER_FLAGS=/manifest:no -DCMAKE_SHARED_LINKER_FLAGS=/manifest:no
106106
build_cache_suffix: icx
107107

108108
e2e-win:

.github/workflows/sycl-windows-build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ jobs:
124124
IF NOT EXIST D:\github\_work\cache\${{inputs.build_cache_suffix}} MKDIR D:\github\_work\cache\${{inputs.build_cache_suffix}}
125125
python.exe src/buildbot/configure.py -o build ^
126126
--ci-defaults %ARGS% ^
127-
--cmake-opt="-DCMAKE_C_COMPILER=${{inputs.compiler}}" ^
128-
--cmake-opt="-DCMAKE_CXX_COMPILER=${{inputs.compiler}}" ^
129-
--cmake-opt="-DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%\install" ^
130-
--cmake-opt="-DCMAKE_CXX_COMPILER_LAUNCHER=ccache" ^
131-
--cmake-opt="-DCMAKE_C_COMPILER_LAUNCHER=ccache" ^
132-
--cmake-opt="-DLLVM_INSTALL_UTILS=ON" ^
133-
--cmake-opt="-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV"
127+
"-DCMAKE_C_COMPILER=${{inputs.compiler}}" ^
128+
"-DCMAKE_CXX_COMPILER=${{inputs.compiler}}" ^
129+
"-DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%\install" ^
130+
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache ^
131+
-DCMAKE_C_COMPILER_LAUNCHER=ccache ^
132+
-DLLVM_INSTALL_UTILS=ON ^
133+
-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV
134134
- name: Build
135135
id: build
136136
shell: bash

0 commit comments

Comments
 (0)