remove filename trimming - follow review

Author: mateuszpn

unified-runtime/source/CMakeLists.txt

@@ -6,9 +6,6 @@
 add_definitions(-DUR_VERSION="${PROJECT_VERSION_MAJOR}")
 add_definitions(-DUR_VALIDATION_LAYER_SUPPORTED_VERSION="${PROJECT_VERSION_MAJOR}")
 
-string(LENGTH "${CMAKE_SOURCE_DIR}/" SRC_PATH_SIZE)
-add_definitions("-DSRC_PATH_SIZE=${SRC_PATH_SIZE}")  # for nicer log messages
-
 add_subdirectory(common)
 add_subdirectory(loader)
 add_subdirectory(mock)

unified-runtime/source/common/logger/ur_logger_details.hpp

@@ -106,27 +106,18 @@ class Logger {
 
 } // namespace logger
 
-#ifdef SRC_PATH_SIZE
-#define SHORT_FILE                                                             \
-  ((SRC_PATH_SIZE < sizeof(__FILE__))                                          \
-       ? ((const char *)__FILE__ + SRC_PATH_SIZE)                              \
-       : __FILE__)
-#else
-#define SHORT_FILE __FILE__
-#endif
-
 #define UR_STRIMPL_(x) #x
 #define UR_STR_(x) UR_STRIMPL_(x)
 
 #define URLOG2_(logger_instance, level, ...)                                   \
   {                                                                            \
-    (logger_instance).log(level, SHORT_FILE, UR_STR_(__LINE__), __VA_ARGS__);  \
+    (logger_instance).log(level, __FILE__, UR_STR_(__LINE__), __VA_ARGS__);    \
   }
+
 #define URLOG_L2_(logger_instance, level, legacy_message, ...)                 \
   {                                                                            \
     (logger_instance)                                                          \
-        .log(legacy_message, level, SHORT_FILE, UR_STR_(__LINE__),             \
-             __VA_ARGS__);                                                     \
+        .log(legacy_message, level, __FILE__, UR_STR_(__LINE__), __VA_ARGS__); \
   }
 
 // some symbols usefuls for log levels are predfined in some systems,

unified-runtime/source/loader/layers/validation/ur_leak_check.hpp

@@ -68,7 +68,7 @@ struct RefCountContext {
             ptr, RefRuntimeInfo{1, std::type_index(typeid(handle)),
                                 getCurrentBacktrace()});
       } else {
-        getContext()->logger.log(UR_LOGGER_LEVEL_ERROR, SHORT_FILE,
+        getContext()->logger.log(UR_LOGGER_LEVEL_ERROR, __FILE__,
                                  UR_STR_(__LINE__), "Handle {} already exists",
                                  ptr);
         return;
@@ -77,7 +77,7 @@ struct RefCountContext {
     case REFCOUNT_INCREASE:
       if (it == counts.end()) {
         getContext()->logger.log(
-            UR_LOGGER_LEVEL_ERROR, SHORT_FILE, UR_STR_(__LINE__),
+            UR_LOGGER_LEVEL_ERROR, __FILE__, UR_STR_(__LINE__),
             "Attempting to retain nonexistent handle {}", ptr);
         return;
       } else {
@@ -95,16 +95,15 @@ struct RefCountContext {
 
       if (it->second.refCount < 0) {
         getContext()->logger.log(
-            UR_LOGGER_LEVEL_ERROR, SHORT_FILE, UR_STR_(__LINE__),
+            UR_LOGGER_LEVEL_ERROR, __FILE__, UR_STR_(__LINE__),
             "Attempting to release nonexistent handle {}", ptr);
       } else if (it->second.refCount == 0 && isAdapterHandle) {
         adapterCount--;
       }
       break;
     }
 
-    getContext()->logger.log(UR_LOGGER_LEVEL_DEBUG, SHORT_FILE,
-                             UR_STR_(__LINE__),
+    getContext()->logger.log(UR_LOGGER_LEVEL_DEBUG, __FILE__, UR_STR_(__LINE__),
                              "Reference count for handle {} changed to {}", ptr,
                              it->second.refCount);
 
@@ -114,7 +113,7 @@ struct RefCountContext {
 
     // No more active adapters, so any references still held are leaked
     if (adapterCount == 0) {
-      logInvalidReferences(SHORT_FILE, UR_STR_(__LINE__));
+      logInvalidReferences(__FILE__, UR_STR_(__LINE__));
       counts.clear();
     }
   }
@@ -175,10 +174,10 @@ struct RefCountContext {
 } // namespace ur_validation_layer
 
 #define URLOG_CTX_INVALID_REFERENCE(ptr)                                       \
-  getContext()->refCountContext->logInvalidReference(SHORT_FILE,               \
+  getContext()->refCountContext->logInvalidReference(__FILE__,                 \
                                                      UR_STR_(__LINE__), ptr);
 #define URLOG_CTX_INVALID_REFERENCES()                                         \
-  getContext()->refCountContext->logInvalidReferences(SHORT_FILE,              \
+  getContext()->refCountContext->logInvalidReferences(__FILE__,                \
                                                       UR_STR_(__LINE__));
 
 #endif /* UR_LEAK_CHECK_H */