[SYCL][XPTI] Unify data types used for code location (#19433)

Column and line numbers used to be represented as different data types
(including both size and sign) in different parts of code.

This commit aligned them all to `uint32_t` which seems to be used under
the hood by both XPTI and UR.

The only exception here is `code_location` struct fields: since it is a
part of `handler`, we can't change data types there just yet without it
breaking ABI. However, all APIs have been changed to use the new unified
types to reduce amount of type casts necessary in the code that uses
them.

This PR belongs to a series which prepares SYCL RT codebase to be
buildable with `-Wconversion` flag that is required per our SDL
processes.

Author: AlexeySachkov

sycl/include/sycl/detail/common.hpp

@@ -14,9 +14,10 @@
 #include <sycl/detail/defines_elementary.hpp> // for __SYCL_ALWAYS_INLINE
 #include <sycl/detail/export.hpp>             // for __SYCL_EXPORT
 
-#include <array>       // for array
-#include <cassert>     // for assert
-#include <cstddef>     // for size_t
+#include <array>   // for array
+#include <cassert> // for assert
+#include <cstddef> // for size_t
+#include <cstdint>
 #include <string>      // for allocator, operator+
 #include <type_traits> // for enable_if_t
 #include <utility>     // for index_sequence, make_i...
@@ -69,8 +70,8 @@ struct code_location {
   static constexpr code_location
   current(const char *fileName = __CODELOC_FILE_NAME,
           const char *funcName = __CODELOC_FUNCTION,
-          unsigned long lineNo = __CODELOC_LINE,
-          unsigned long columnNo = __CODELOC_COLUMN) noexcept {
+          uint32_t lineNo = __CODELOC_LINE,
+          uint32_t columnNo = __CODELOC_COLUMN) noexcept {
     return code_location(fileName, funcName, lineNo, columnNo);
   }
 
@@ -79,23 +80,34 @@ struct code_location {
 #undef __CODELOC_LINE
 #undef __CODELOC_COLUMN
 
-  constexpr code_location(const char *file, const char *func, int line,
-                          int col) noexcept
+  constexpr code_location(const char *file, const char *func, uint32_t line,
+                          uint32_t col) noexcept
       : MFileName(file), MFunctionName(func), MLineNo(line), MColumnNo(col) {}
 
   constexpr code_location() noexcept
-      : MFileName(nullptr), MFunctionName(nullptr), MLineNo(0), MColumnNo(0) {}
+      : MFileName(nullptr), MFunctionName(nullptr), MLineNo(0u), MColumnNo(0u) {
+  }
 
-  constexpr unsigned long lineNumber() const noexcept { return MLineNo; }
-  constexpr unsigned long columnNumber() const noexcept { return MColumnNo; }
+  constexpr uint32_t lineNumber() const noexcept {
+    return static_cast<uint32_t>(MLineNo);
+  }
+  constexpr uint32_t columnNumber() const noexcept {
+    return static_cast<uint32_t>(MColumnNo);
+  }
   constexpr const char *fileName() const noexcept { return MFileName; }
   constexpr const char *functionName() const noexcept { return MFunctionName; }
 
 private:
   const char *MFileName;
   const char *MFunctionName;
+#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
+  // For preserving layout of handler class
   unsigned long MLineNo;
   unsigned long MColumnNo;
+#else
+  uint32_t MLineNo;
+  uint32_t MColumnNo;
+#endif
 };
 
 /// @brief Data type that manages the code_location information in TLS

sycl/source/detail/cg.hpp

@@ -240,7 +240,7 @@ class CG {
   // Storage for function name and source file name
   std::string MFunctionName, MFileName;
   // Storage for line and column of code location
-  int32_t MLine, MColumn;
+  uint32_t MLine, MColumn;
   bool MIsTopCodeLoc;
 };
 

sycl/source/detail/queue_impl.cpp

@@ -544,9 +544,10 @@ void *queue_impl::instrumentationProlog(const detail::code_location &CodeLoc,
       xpti::addMetadata(WaitEvent, "sym_function_name", CodeLoc.functionName());
       xpti::addMetadata(WaitEvent, "sym_source_file_name", CodeLoc.fileName());
       xpti::addMetadata(WaitEvent, "sym_line_no",
-                        static_cast<int32_t>((CodeLoc.lineNumber())));
-      xpti::addMetadata(WaitEvent, "sym_column_no",
-                        static_cast<int32_t>((CodeLoc.columnNumber())));
+                        static_cast<xpti::object_id_t>((CodeLoc.lineNumber())));
+      xpti::addMetadata(
+          WaitEvent, "sym_column_no",
+          static_cast<xpti::object_id_t>((CodeLoc.columnNumber())));
     }
     xptiNotifySubscribers(StreamID, xpti::trace_wait_begin, nullptr, WaitEvent,
                           QWaitInstanceNo,

sycl/source/detail/scheduler/commands.cpp

@@ -1022,9 +1022,9 @@ void Command::copySubmissionCodeLocation() {
   if (TData.functionName())
     MSubmissionFunctionName = TData.functionName();
   if (MSubmissionFileName.size() || MSubmissionFunctionName.size())
-    MSubmissionCodeLocation = {
-        MSubmissionFileName.c_str(), MSubmissionFunctionName.c_str(),
-        (int)TData.lineNumber(), (int)TData.columnNumber()};
+    MSubmissionCodeLocation = {MSubmissionFileName.c_str(),
+                               MSubmissionFunctionName.c_str(),
+                               TData.lineNumber(), TData.columnNumber()};
 #endif
 }
 

xpti/include/xpti/xpti_data_types.h

@@ -578,15 +578,13 @@ struct payload_t {
   /// @param codeptr (Optional) Pointer to the code location associated with
   /// this payload.
   ///
-  payload_t(const char *kname, const char *sf, int line, int col,
+  payload_t(const char *kname, const char *sf, uint32_t line, uint32_t col,
             const void *codeptr = nullptr) {
     code_ptr_va = codeptr; ///< Override the default initialization
     name = kname;          ///< Override the default initialization
     source_file = sf;      ///< Override the default initialization
-    line_no =
-        static_cast<uint32_t>(line); ///< Override the default initialization
-    column_no =
-        static_cast<uint32_t>(col); ///< Override the default initialization
+    line_no = line;        ///< Override the default initialization
+    column_no = col;       ///< Override the default initialization
     // If the incoming name is null, we ensure that the flags are set correctly
     if (kname && kname[0] != '\0') {
       flags = (uint64_t)payload_flag_t::NameAvailable;

xpti/include/xpti/xpti_trace_framework.hpp

@@ -1593,8 +1593,8 @@ class tracepoint_t {
   // Constructor that makes calls to xpti API layer to register strings and
   // create the Universal ID that is stored in the TLS entry for lookup; this
   // constructor is needed when only code location information is available
-  tracepoint_t(const char *fileName, const char *funcName, int line, int column,
-               void *codeptr = nullptr)
+  tracepoint_t(const char *fileName, const char *funcName, uint32_t line,
+               uint32_t column, void *codeptr = nullptr)
       : m_payload(nullptr), m_top(false) {
     // If tracing is not enabled, don't do anything
     if (!xptiTraceEnabled())