[SYCL][CMake] Fix and apply hardening flags to sycl-rel-6_2
#19444
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CMake has a notion of scopes for variables and we fell into a pitfall of setting local variables instead of applying changes globally to the whole project. For reference, see: - https://cmake.org/cmake/help/v3.20/command/set.html - https://cmake.org/cmake/help/v3.20/command/include.html
Co-authored-by: Alexey Sachkov <[email protected]>
CMake is capable of setting `-fPIE` correctly and we don't need to intervene with that. Without the patch, I see the following errors: ``` FAILED: lib/libze_trace_collector.so : && /usr/bin/clang++ -fPIC -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Werror=unguarded-availability-new -Wall -Wextra -Wno-unused-parameter -Wwrite -strings -Wcast-qual -Wmissing-field-initializers -pedantic -Wno-long-long -Wc++98-compat-extra-semi -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion -Wmisleading-indentation -Wctad-maybe-unsupported -fdiagnostics-color -ffunction-sections -fdata-sections -Wall -Wextra -fcf-protection=full -Wformat -Wformat-security -fPIC -fPIE -Wno-covered-switch-default -Wall -Wextra -Werror -O2 -g -DNDEBUG -Wl,-z,defs -Wl,-z,nodelete -pie -shared -Wl,-soname,libze_ trace_collector.so -o lib/libze_trace_collector.so tools/sycl/tools/sycl-trace/CMakeFiles/ze_trace_collector.dir/ze_trace_collector.cpp.o -Wl,-rpath,build/lib: lib/libxptifw.so -ldl && : clang++: error: argument unused during compilation: '-pie' [-Werror,-Wunused-command-line-argument] ```
We can't have this flag being applied globally, because it then affects SYCL RT which has plenty of libraries that are supposed to be `dlopen`ed by design. It probably makes sense to apply `nodlopen` for some of our executables, but that should be done on a case-by-case basis. For now, let's just fix the toolchain with hardening flags applied, any improvements can be done as a follow-up later.
The problem here is that the macro is actually handled by glibc and value `3` isn't supported with older compiler/glibc combinations, causing warnings about the macro redefinition. We still have to support older compilers/glibc and therefore two changes were made: - UR skips setting their own `_FORTIFY_SOURCE` in favor of a global one if it is built as part of LLVM (i.e. not standalone) - Before setting `_FORTIFY_SOURCE` globally we check the compiler and fallback to value `2` for older gcc
This reverts commit 00eb54c.
AlexeySachkov
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
|
Notes for reviewers: Additional changes which have not been applied to the
I didn't put those commit references to the PR description, because they will be useless in the final squashed commit that will go into the repo. You can also see more commits in this PR, but this was a process of some trial and error in figuring out the best approach at getting the project buildable with hardening flags enabled. They were all effectively reverted and all changes that remained are outlined above. I also ran nightly validation for this PR to increase scope of testing here: https://github.com/intel/llvm/actions/runs/16271004049 |
kbenzie
approved these changes
Jul 15, 2025
AlexeySachkov
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
AlexeySachkov
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
We rely on CMake to set the right set of compliation and link flags to enable positition independent code and position independent execution. Before this commit, necessary compliation flags were applied just fine, but link flags were missing. To get link flags, some extra CMake functions should be called.
AlexeySachkov
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
AlexeySachkov
temporarily deployed
to
WindowsCILock
GitHub Actions
Inactive
AlexeySachkov
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
AlexeySachkov
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
AlexeySachkov
temporarily deployed
to
WindowsCILock
GitHub Actions
Inactive
AlexeySachkov
had a problem deploying
to
WindowsCILock
GitHub Actions
Failure
|
An updated nightly validation run which includes the new cherry-picked commit about |
maarquitos14
approved these changes
Jul 16, 2025
|
Pre-commit on this release branch isn't fully configured, because some CI scripts are out-of-date. However, I did perform nightly validation on the PR and its results were good, I will proceed with the merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains several cherry-picks and some unique changes which have not been applied to the
syclbranch yet.The intent of this PR is to enable as much (quickly) possible hardening flags to be in better compliance with our SDL requirements.
The main thing this PR is after are things like immediate bindings, fortify source, stack protection and
relro.The thing that this PR is not after are extra warning flags - some of them we can't apply globally because LLVM itself isn't warning free, some of them we can't apply even locally to SYCL RT because we haven't fixed corresponding warnings yet.
Patches which were cherry-picked from the
syclbranch:-fPIEhandling #19235)nodlopenfrom hardening flags #19357)-piehardening flag #19447)Additional changes which have not been applied to the
syclbranch:configure.pyto the new way of-fPIEhandling/sdlflag because LLVM isn't warning-freesyclbranch for future releases/analyzeflag because SYCL RT isn't warning-freesyclbranch for future releases