[SYCL][XPTI] Enable XPTI tests (#4545)

- Fix XPTI libraries deployment locations in CMake
- Fix incorrect definitions and options in CMake
- Enable -Werror for XPTI by default
- Add LLVM-style target check-xptifw
- Run check-xptifw by default in GitHub Actions post-commit job
- Fix whatever warnings the compiler complained about.

Author: alexbatashev

.github/workflows/linux_post_commit.yml

@@ -78,6 +78,11 @@ jobs:
        run: |
          python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w  $GITHUB_WORKSPACE \
          -s  $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-llvm-spirv
+     - name: check-xptifw
+       if: always()
+       run: |
+         python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w  $GITHUB_WORKSPACE \
+         -s  $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-xptifw
      - name: Pack
        run: tar -czvf llvm_sycl.tar.gz -C $GITHUB_WORKSPACE/build/install .
      - name: Upload artifacts

buildbot/configure.py

@@ -40,6 +40,7 @@ def do_configure(args):
     llvm_enable_lld = 'OFF'
 
     sycl_enable_xpti_tracing = 'ON'
+    xpti_enable_werror = 'ON'
 
     if args.ci_defaults:
         print("#############################################")
@@ -79,6 +80,7 @@ def do_configure(args):
 
     if args.no_werror:
         sycl_werror = 'OFF'
+        xpti_enable_werror = 'OFF'
 
     if args.no_assertions:
         llvm_enable_assertions = 'OFF'
@@ -123,7 +125,8 @@ def do_configure(args):
         "-DBUILD_SHARED_LIBS={}".format(llvm_build_shared_libs),
         "-DSYCL_ENABLE_XPTI_TRACING={}".format(sycl_enable_xpti_tracing),
         "-DLLVM_ENABLE_LLD={}".format(llvm_enable_lld),
-        "-DSYCL_BUILD_PI_ESIMD_CPU={}".format(sycl_build_pi_esimd_cpu)
+        "-DSYCL_BUILD_PI_ESIMD_CPU={}".format(sycl_build_pi_esimd_cpu),
+        "-DXPTI_ENABLE_WERROR={}".format(xpti_enable_werror)
     ]
 
     if args.l0_headers and args.l0_loader:

sycl/CMakeLists.txt

@@ -172,7 +172,7 @@ if (NOT WIN32)
 endif()
 
 if (SYCL_ENABLE_XPTI_TRACING)
-  set(XPTIFW_LIBS xptifw)
+  set(XPTIFW_LIBS xpti xptifw)
 endif()
 
 # SYCL toolchain builds all components: compiler, libraries, headers, etc.

sycl/source/detail/event_impl.cpp

@@ -18,7 +18,7 @@
 #include <chrono>
 
 #ifdef XPTI_ENABLE_INSTRUMENTATION
-#include "xpti_trace_framework.hpp"
+#include "xpti/xpti_trace_framework.hpp"
 #include <atomic>
 #include <detail/xpti_registry.hpp>
 #include <sstream>

sycl/source/detail/pi.cpp

@@ -35,7 +35,7 @@
 #ifdef XPTI_ENABLE_INSTRUMENTATION
 // Include the headers necessary for emitting
 // traces using the trace framework
-#include "xpti_trace_framework.h"
+#include "xpti/xpti_trace_framework.h"
 #endif
 
 #define STR(x) #x

sycl/source/detail/plugin.hpp

@@ -18,7 +18,7 @@
 
 #ifdef XPTI_ENABLE_INSTRUMENTATION
 // Include the headers necessary for emitting traces using the trace framework
-#include "xpti_trace_framework.h"
+#include "xpti/xpti_trace_framework.h"
 #endif
 
 __SYCL_INLINE_NAMESPACE(cl) {

sycl/source/detail/queue_impl.cpp

@@ -17,7 +17,7 @@
 #include <utility>
 
 #ifdef XPTI_ENABLE_INSTRUMENTATION
-#include "xpti_trace_framework.hpp"
+#include "xpti/xpti_trace_framework.hpp"
 #include <detail/xpti_registry.hpp>
 #include <sstream>
 #endif

sycl/source/detail/scheduler/commands.cpp

@@ -43,7 +43,7 @@
 #endif
 
 #ifdef XPTI_ENABLE_INSTRUMENTATION
-#include "xpti_trace_framework.hpp"
+#include "xpti/xpti_trace_framework.hpp"
 #include <detail/xpti_registry.hpp>
 #endif
 

sycl/source/detail/xpti_registry.hpp

@@ -14,7 +14,7 @@
 #ifdef XPTI_ENABLE_INSTRUMENTATION
 // Include the headers necessary for emitting
 // traces using the trace framework
-#include "xpti_trace_framework.h"
+#include "xpti/xpti_trace_framework.h"
 #endif
 
 __SYCL_INLINE_NAMESPACE(cl) {

sycl/tools/pi-trace/pi_trace.cpp

@@ -10,7 +10,7 @@
 /// A sample XPTI subscriber to demonstrate how to collect PI function call
 /// arguments.
 
-#include "xpti_trace_framework.h"
+#include "xpti/xpti_trace_framework.h"
 
 #include "pi_arguments_handler.hpp"