[UR] Fix typo in cfi flags handling. (#17452)

Also remove a cfi exclusive KNOWN_FAILURE as it couldn't be reproduced
across a few platforms.

closes oneapi-src/unified-runtime#2647

Author: aarongreig

unified-runtime/cmake/helpers.cmake

@@ -80,7 +80,7 @@ else()
 endif()
 
 set(CFI_FLAGS "")
-if (CFI_HAS_CFI_SANITIZE)
+if (CXX_HAS_CFI_SANITIZE)
     # cfi-icall requires called functions in shared libraries to also be built with cfi-icall, which we can't
     # guarantee. -fsanitize=cfi depends on -flto
     set(CFI_FLAGS "-flto -fsanitize=cfi -fno-sanitize=cfi-icall -fsanitize-ignorelist=${PROJECT_SOURCE_DIR}/sanitizer-ignorelist.txt")
@@ -103,14 +103,17 @@ function(add_ur_target_compile_options name)
             -fstack-protector-strong
             -fvisibility=hidden
 
-            ${CFI_FLAGS}
             $<$<BOOL:${CXX_HAS_FCF_PROTECTION_FULL}>:-fcf-protection=full>
             $<$<BOOL:${CXX_HAS_FSTACK_CLASH_PROTECTION}>:-fstack-clash-protection>
 
             # Colored output
             $<$<CXX_COMPILER_ID:GNU>:-fdiagnostics-color=always>
             $<$<CXX_COMPILER_ID:Clang,AppleClang>:-fcolor-diagnostics>
         )
+        # Cmake can't handle mixing strings without quotes as the options above
+        # are and strings with quotes like ${CFI_FLAGS} is, so this needs a
+        # separate call.
+        target_compile_options(${name} PRIVATE ${CFI_FLAGS})
         if (UR_DEVELOPER_MODE)
             target_compile_options(${name} PRIVATE -Werror -Wextra)
         endif()
@@ -151,8 +154,7 @@ function(add_ur_target_link_options name)
     if(NOT MSVC)
         if (NOT APPLE)
             target_link_options(${name} PRIVATE
-                ${CFI_FLAGS}
-                "LINKER:-z,relro,-z,now,-z,noexecstack"
+                "LINKER:-z,relro,-z,now,-z,noexecstack ${CFI_FLAGS}"
             )
             if (UR_DEVELOPER_MODE)
                 target_link_options(${name} PRIVATE -Werror -Wextra)

unified-runtime/test/conformance/enqueue/urEnqueueEventsWaitMultiDevice.cpp

@@ -194,13 +194,6 @@ TEST_P(urEnqueueEventsWaitMultiDeviceMTTest, EnqueueWaitSingleQueueMultiOps) {
 }
 
 TEST_P(urEnqueueEventsWaitMultiDeviceMTTest, EnqueueWaitOnAllQueues) {
-  // Fails when -fsanitize=cfi
-#ifdef UR_USE_CFI
-  if (getParam().value) {
-    UUR_KNOWN_FAILURE_ON(uur::OpenCL{});
-  }
-#endif
-
   std::vector<uur::raii::Event> eventsRaii(devices.size());
   std::vector<ur_event_handle_t> events(devices.size());
   auto work = [this, &events, &eventsRaii](size_t i) {