Amend platform repo paths with version specific path (#9503)

Under XDG_DATA_DIR use XRT_VERSION_STRING for application data dir
directory.  Make sure version specific directory is searched prior to
non-versioned directory.

This is facilitating xrt-smi in its search for validation artifact
archives, such that the search can be specific to an XRT version.

Signed-off-by: Soren Soe <2106410+stsoe@users.noreply.github.com>

Author: stsoe

src/CMake/settings.cmake

@@ -57,14 +57,16 @@ endif (NOT CMAKE_BUILD_TYPE)
 # --- version settings ---
 # Version adjusted to 2.21 for 2026.1
 set(XRT_VERSION_RELEASE 202610)
-SET(XRT_VERSION_MAJOR 2)
-SET(XRT_VERSION_MINOR 21)
+set(XRT_VERSION_MAJOR 2)
+set(XRT_VERSION_MINOR 21)
 
-if (DEFINED ENV{XRT_VERSION_PATCH})
-  SET(XRT_VERSION_PATCH $ENV{XRT_VERSION_PATCH})
-else(DEFINED $ENV{XRT_VERSION_PATCH})
-  SET(XRT_VERSION_PATCH 0)
-endif(DEFINED ENV{XRT_VERSION_PATCH})
+if (XRT_VERSION_PATCH)
+  set(XRT_VERSION_PATCH ${XRT_VERSION_PATCH})
+elseif (DEFINED ENV{XRT_VERSION_PATCH})
+  set(XRT_VERSION_PATCH $ENV{XRT_VERSION_PATCH})
+else()
+  set(XRT_VERSION_PATCH 0)
+endif(XRT_VERSION_PATCH)
 
 # Also update cache to set version for external plug-in .so
 set(XRT_SOVERSION ${XRT_VERSION_MAJOR} CACHE INTERNAL "")

src/runtime_src/core/common/CMakeLists.txt

@@ -71,6 +71,7 @@ target_include_directories(core_common_library_objects
 
 set_property(SOURCE module_loader.cpp APPEND PROPERTY COMPILE_DEFINITIONS
   XRT_VERSION_MAJOR="${XRT_VERSION_MAJOR}"
+  XRT_VERSION_STRING="${XRT_VERSION_STRING}"
   XRT_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"
   XRT_LIB_DIR="${CMAKE_INSTALL_LIBDIR}"
   )
@@ -169,4 +170,4 @@ else()
   install(TARGETS xrt_coreutil_static
     EXPORT xrt-targets
     ARCHIVE DESTINATION ${XRT_INSTALL_LIB_DIR} COMPONENT ${XRT_BASE_DEV_COMPONENT})
-endif()
+endif()

src/runtime_src/core/common/detail/linux/xilinx_xrt.h

@@ -1,10 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2023-2025 Advanced Micro Devices, Inc. All rights reserved.
 
+// This file is an implementation detail of the XRT coreutil library.
+// It is not part of the public XRT API. Include guards are not
+// at this level.
 #include "core/common/debug.h"
 #include "core/common/module_loader.h"
 
 #include <dlfcn.h>
+
+#include <cstdlib>
 #include <filesystem>
 #include <stdexcept>
 #include <string>
@@ -14,6 +19,10 @@
 # error "XRT_INSTALL_PREFIX is undefined"
 #endif
 
+#ifndef XRT_VERSION_STRING
+# error "XRT_VERSION_STRING is undefined"
+#endif
+
 namespace xrt_core::detail {
 
 namespace sfs = std::filesystem;
@@ -29,11 +38,36 @@ xilinx_xrt()
   if (std::string(info.dli_fname).find("libxrt_coreutil") == std::string::npos)
     return sfs::path(XRT_INSTALL_PREFIX);
 
-  // Relocatable path based on install location of this DSO
-  sfs::path so_path(sfs::canonical(info.dli_fname)); // /.../lib/libxrt_coreutil.so
-  return so_path.parent_path().parent_path();
+  try {
+    // Relocatable path based on install location of this DSO
+    sfs::path so_path(sfs::canonical(info.dli_fname)); // /.../lib/libxrt_coreutil.so
+    return so_path.parent_path().parent_path();
+  }
+  catch (const std::exception&) {
+    return sfs::path(XRT_INSTALL_PREFIX);
+  }
 }
 
+// platform_repo_path() - Get candidate paths for platform repository data
+//
+// Returns a prioritized list of filesystem paths where
+// platform-specific data files (e.g., FPGA platform metadata) may be
+// located. The search order is:
+//
+// 1. XRT installation share directory:
+//    - <xrt_root>/share (if xrt_root ends with "xrt")
+//    - <xrt_root>/share/xrt (otherwise)
+//
+// 2. XDG user data directory (if XDG_DATA_HOME is set):
+//    - $XDG_DATA_HOME/xrt/<version>
+//    - $XDG_DATA_HOME/xrt
+//
+// 3. User's local share directory (if HOME is set):
+//    - $HOME/.local/share/xrt/<version>
+//    - $HOME/.local/share/xrt
+//
+// Returned paths are not validated - caller must check existence
+// Follows XDG Base Directory Specification for user data paths
 std::vector<sfs::path>
 platform_repo_path()
 {
@@ -51,10 +85,14 @@ platform_repo_path()
     paths.push_back(xrt / "share/xrt");
 
   // 2. XDG data path ($HOME/.local/share) is also a candidate
-  if (const char* xdg = std::getenv("XDG_DATA_HOME"); xdg && *xdg)
+  if (const char* xdg = std::getenv("XDG_DATA_HOME"); xdg && *xdg) {
+    paths.push_back(sfs::path(xdg) / "xrt" / XRT_VERSION_STRING);
     paths.push_back(sfs::path(xdg) / "xrt");
-  else if (const char* home = std::getenv("HOME"); home && *home)
+  }
+  else if (const char* home = std::getenv("HOME"); home && *home) {
+    paths.push_back(sfs::path(home) / ".local/share/xrt" / XRT_VERSION_STRING);
     paths.push_back(sfs::path(home) / ".local/share/xrt");
+  }
 
   return paths;
 }