Error out when LIBOMPTARGET_OMPT_SUPPORT is requested but not supported
#146865
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
|
@llvm/pr-subscribers-offload Author: Alexander Grund (Flamefire) ChangesCurrently a user could pass There is already a check for Full diff: https://github.com/llvm/llvm-project/pull/146865.diff 1 Files Affected:
diff --git a/offload/CMakeLists.txt b/offload/CMakeLists.txt
index 0a441c3bc5782..f5c39e9ebf4a3 100644
--- a/offload/CMakeLists.txt
+++ b/offload/CMakeLists.txt
@@ -326,15 +326,17 @@ endmacro()
# OMPT support for libomptarget
# Follow host OMPT support and check if host support has been requested.
-# LIBOMP_HAVE_OMPT_SUPPORT indicates whether host OMPT support has been implemented.
# LIBOMP_OMPT_SUPPORT indicates whether host OMPT support has been requested (default is ON).
-# LIBOMPTARGET_OMPT_SUPPORT indicates whether target OMPT support has been requested (default is ON).
set(OMPT_TARGET_DEFAULT FALSE)
-if ((LIBOMP_HAVE_OMPT_SUPPORT) AND (LIBOMP_OMPT_SUPPORT) AND (NOT WIN32))
+if (LIBOMP_OMPT_SUPPORT AND (NOT WIN32))
set (OMPT_TARGET_DEFAULT TRUE)
endif()
+# LIBOMPTARGET_OMPT_SUPPORT indicates whether target OMPT support has been requested.
set(LIBOMPTARGET_OMPT_SUPPORT ${OMPT_TARGET_DEFAULT} CACHE BOOL "OMPT-target-support?")
-if ((OMPT_TARGET_DEFAULT) AND (LIBOMPTARGET_OMPT_SUPPORT))
+if (LIBOMPTARGET_OMPT_SUPPORT)
+ if(NOT LIBOMP_OMPT_SUPPORT)
+ message(FATAL_ERROR "OMPT Target support requested but OMPT (host) support is not enabled")
+ endif()
add_definitions(-DOMPT_SUPPORT=1)
message(STATUS "OMPT target enabled")
else()
|
|
|
…rted Currently a user could pass `-DLIBOMPTARGET_OMPT_SUPPORT=ON` but the build may ignore it There is already a check for `LIBOMP_OMPT_SUPPORT AND NOT LIBOMP_HAVE_OMPT_SUPPORT` causing an error so a) There should be a similar error on mismatch of passed options and supported configuration b) The check for `LIBOMP_HAVE_OMPT_SUPPORT` is redundant
2 tasks
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.
Currently a user could pass
-DLIBOMPTARGET_OMPT_SUPPORT=ONbut the build may ignore itThere is already a check for
LIBOMP_OMPT_SUPPORT AND NOT LIBOMP_HAVE_OMPT_SUPPORTcausing an error so a) There should be a similar error on mismatch of passed options and supported configuration b) The check forLIBOMP_HAVE_OMPT_SUPPORTis redundantWe ran into this for automated builds where the output "OMPT target disabled" isn't as useful as a hard abort (exit code !=0)