Skip to content

Commit ec2cbc8

Browse files
committed
Disable assertions by default in configure.py script
1 parent 7d40de9 commit ec2cbc8

File tree

8 files changed

+16
-11
lines changed

8 files changed

+16
-11
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
build_cache_root: "/__w/"
4646
build_artifact_suffix: "default"
4747
build_cache_suffix: "default"
48+
build_configure_extra_args: --enable-assertions
4849
# Docker image has last nightly pre-installed and added to the PATH
4950
build_image: "ghcr.io/intel/llvm/sycl_ubuntu2404_nightly:latest"
5051
cc: clang

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ jobs:
4949
cd $GITHUB_WORKSPACE/build
5050
python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
5151
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
52+
--enable-assertions \
5253
--ci-defaults $ARGS \
5354
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
5455
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \

.github/workflows/sycl-nightly.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
build_cache_root: "/__w/"
1717
build_artifact_suffix: default
18-
build_configure_extra_args: '--hip --cuda'
18+
build_configure_extra_args: '--enable-assertions --hip --cuda'
1919
build_image: ghcr.io/intel/llvm/ubuntu2204_build:latest
2020
retention-days: 90
2121

@@ -31,7 +31,7 @@ jobs:
3131
build_cache_root: "/__w/"
3232
build_cache_suffix: sprod_shared
3333
build_artifact_suffix: sprod_shared
34-
build_configure_extra_args: '--shared-libs --hip --cuda --native_cpu'
34+
build_configure_extra_args: '--enable-assertions --shared-libs --hip --cuda --native_cpu'
3535

3636
artifact_archive_name: sycl_linux_shared.tar.zst
3737

@@ -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: -DCMAKE_C_FLAGS="-no-intel-lib -ffp-model=precise" -DCMAKE_CXX_FLAGS="-no-intel-lib -ffp-model=precise"
46+
build_configure_extra_args: --enable-assertions -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

@@ -156,6 +156,7 @@ jobs:
156156
# We upload both Linux/Windows build via Github's "Releases"
157157
# functionality, make sure Linux/Windows names follow the same pattern.
158158
artifact_archive_name: sycl_windows.tar.gz
159+
build_configure_extra_args: --enable-assertions
159160

160161
e2e-win:
161162
needs: build-win

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
build_cache_root: "/__w/llvm"
4242
build_cache_suffix: default
4343
build_artifact_suffix: default
44-
build_configure_extra_args: --no-assertions --hip --cuda --native_cpu -DSYCL_ENABLE_STACK_PRINTING=ON -DSYCL_LIB_WITH_DEBUG_SYMBOL=ON
44+
build_configure_extra_args: --hip --cuda --native_cpu -DSYCL_ENABLE_STACK_PRINTING=ON -DSYCL_LIB_WITH_DEBUG_SYMBOL=ON
4545

4646
e2e-lin:
4747
needs: [detect_changes, build-lin]
@@ -113,7 +113,7 @@ jobs:
113113
uses: ./.github/workflows/sycl-windows-build.yml
114114
with:
115115
compiler: icx
116-
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
116+
build_configure_extra_args: --enable-assertions -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
117117
build_cache_suffix: icx
118118

119119
e2e-win:

.github/workflows/sycl-rel-nightly.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
with:
3939
build_cache_root: "/__w/"
4040
build_artifact_suffix: default
41-
build_configure_extra_args: '--hip --cuda'
41+
build_configure_extra_args: '--enable-assertions --hip --cuda'
4242
build_image: ghcr.io/intel/llvm/ubuntu2204_build:latest
4343
build_ref: sycl-rel-6_1_0
4444

@@ -105,6 +105,7 @@ jobs:
105105
# We upload both Linux/Windows build via Github's "Releases"
106106
# functionality, make sure Linux/Windows names follow the same pattern.
107107
artifact_archive_name: sycl_windows.tar.gz
108+
build_configure_extra_args: --enable-assertions
108109

109110
e2e-win:
110111
needs: build-win

.github/workflows/sycl-weekly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
with:
1717
build_cache_root: "/__w/"
1818
build_artifact_suffix: default
19-
build_configure_extra_args: ''
19+
build_configure_extra_args: '--enable-assertions'
2020

2121
# This job builds SYCL-CTS with -fsycl-use-spirv-backend-for-spirv-gen.
2222
build-sycl-cts:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
uses: ./.github/workflows/sycl-windows-build.yml
4444
with:
4545
changes: ${{ needs.detect_changes.outputs.filters }}
46+
build_configure_extra_args: "--enable-assertions"
4647

4748
e2e:
4849
needs: build

buildbot/configure.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def do_configure(args, passthrough_args):
5454
sycl_build_pi_hip_platform = "AMD"
5555
sycl_clang_extra_flags = ""
5656
sycl_werror = "OFF"
57-
llvm_enable_assertions = "ON"
57+
llvm_enable_assertions = "OFF"
5858
llvm_enable_doxygen = "OFF"
5959
llvm_enable_sphinx = "OFF"
6060
llvm_build_shared_libs = "OFF"
@@ -122,8 +122,8 @@ def do_configure(args, passthrough_args):
122122
sycl_werror = "ON"
123123
xpti_enable_werror = "ON"
124124

125-
if args.no_assertions:
126-
llvm_enable_assertions = "OFF"
125+
if args.enable_assertions:
126+
llvm_enable_assertions = "ON"
127127

128128
if args.docs:
129129
llvm_enable_sphinx = "ON"
@@ -357,7 +357,7 @@ def main():
357357
help="build compiler with all supported targets, it doesn't change runtime build",
358358
)
359359
parser.add_argument(
360-
"--no-assertions", action="store_true", help="build without assertions"
360+
"--enable-assertions", action="store_true", help="Build with assertions."
361361
)
362362
parser.add_argument(
363363
"--docs", action="store_true", help="build Doxygen documentation"

0 commit comments

Comments
 (0)