diff --git a/src/runtime_src/core/common/CMakeLists.txt b/src/runtime_src/core/common/CMakeLists.txt
index d4258e17ca5..af0109ae1bc 100644
--- a/src/runtime_src/core/common/CMakeLists.txt
+++ b/src/runtime_src/core/common/CMakeLists.txt
@@ -8,6 +8,7 @@ endif()
 add_subdirectory(api)
 add_subdirectory(xdp)
 add_subdirectory(runner)
+add_subdirectory(smi)
 
 if(CMAKE_VERSION VERSION_LESS "3.18.0")
   message(WARNING "CMake version is less than 3.18.0, build of submodule aiebu disabled")
@@ -51,7 +52,6 @@ add_library(core_common_library_objects OBJECT
   sysinfo.cpp
   xclbin_parser.cpp
   xclbin_swemu.cpp
-  smi.cpp
   )
 
 target_include_directories(core_common_library_objects
@@ -84,6 +84,7 @@ add_library(xrt_coreutil SHARED
   $<TARGET_OBJECTS:core_common_runner_objects>
   $<TARGET_OBJECTS:core_common_api_library_objects>
   $<TARGET_OBJECTS:core_common_xdp_profile_objects>
+  $<TARGET_OBJECTS:core_common_smi_objects>
   )
 
 add_library(xrt_coreutil_static STATIC
@@ -91,6 +92,7 @@ add_library(xrt_coreutil_static STATIC
   $<TARGET_OBJECTS:core_common_runner_objects>
   $<TARGET_OBJECTS:core_common_api_library_objects>
   $<TARGET_OBJECTS:core_common_xdp_profile_objects>
+  $<TARGET_OBJECTS:core_common_smi_objects>
   )
 
 set_target_properties(xrt_coreutil PROPERTIES
diff --git a/src/runtime_src/core/common/smi/CMakeLists.txt b/src/runtime_src/core/common/smi/CMakeLists.txt
new file mode 100644
index 00000000000..a0d06f22e0a
--- /dev/null
+++ b/src/runtime_src/core/common/smi/CMakeLists.txt
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.
+#
+# OBJECT libraries linked into xrt_coreutil, xrt_core (Alveo/edge), and xrt_driver_xdna / other shims.
+
+add_library(core_common_smi_objects OBJECT smi.cpp)
+target_include_directories(core_common_smi_objects
+  PRIVATE
+  ${XRT_SOURCE_DIR}/runtime_src
+  )
+
+add_library(core_smi_alveo_objects OBJECT smi_alveo.cpp)
+add_library(core_smi_ryzen_objects OBJECT smi_ryzen.cpp)
diff --git a/src/runtime_src/core/common/smi.cpp b/src/runtime_src/core/common/smi/smi.cpp
similarity index 99%
rename from src/runtime_src/core/common/smi.cpp
rename to src/runtime_src/core/common/smi/smi.cpp
index 41199b18082..8270c66ccea 100644
--- a/src/runtime_src/core/common/smi.cpp
+++ b/src/runtime_src/core/common/smi/smi.cpp
@@ -4,7 +4,7 @@
 #define XRT_CORE_COMMON_SOURCE
 
 // Local - Include Files
-#include "smi.h"
+#include "core/common/smi/smi.h"
 
 // 3rd Party Library - Include Files
 #include <boost/property_tree/json_parser.hpp>
diff --git a/src/runtime_src/core/common/smi.h b/src/runtime_src/core/common/smi/smi.h
similarity index 98%
rename from src/runtime_src/core/common/smi.h
rename to src/runtime_src/core/common/smi/smi.h
index 726d0db2b81..fdbb14eb843 100644
--- a/src/runtime_src/core/common/smi.h
+++ b/src/runtime_src/core/common/smi/smi.h
@@ -3,8 +3,8 @@
 
 #pragma once
 // Local include files
-#include "config.h"
-#include "query_requests.h"
+#include "core/common/config.h"
+#include "core/common/query_requests.h"
 
 // 3rd Party Library - Include Files
 #include <boost/property_tree/ptree.hpp>
@@ -182,7 +182,7 @@ class config_generator {
   // This subcommand is used for device and host configuration.
   // Derived classes must implement this method to define hardware-specific configuration logic.
   virtual subcommand 
-  create_configure_subcommand() = 0; 
+  create_configure_subcommand() = 0;
 };
 
 // class smi_hardware_config
diff --git a/src/runtime_src/core/pcie/linux/smi_pcie.cpp b/src/runtime_src/core/common/smi/smi_alveo.cpp
similarity index 93%
rename from src/runtime_src/core/pcie/linux/smi_pcie.cpp
rename to src/runtime_src/core/common/smi/smi_alveo.cpp
index d322bb44315..1678491474e 100644
--- a/src/runtime_src/core/pcie/linux/smi_pcie.cpp
+++ b/src/runtime_src/core/common/smi/smi_alveo.cpp
@@ -1,10 +1,18 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.
-#include "smi_pcie.h"
 
-namespace shim_pcie::smi {
+#include "core/common/smi/smi_alveo.h"
 
-xrt_core::smi::subcommand
+#include "core/common/smi/smi.h"
+
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+namespace xrt_core::smi::alveo {
+
+static xrt_core::smi::subcommand
 create_validate_subcommand()
 {
   std::vector<xrt_core::smi::basic_option> validate_test_desc = {
@@ -29,7 +37,7 @@ create_validate_subcommand()
     {"verify", "Run 'Hello World' kernel test", "common"}
   };
 
-   std::map<std::string, std::shared_ptr<xrt_core::smi::option>> validate_suboptions;
+  std::map<std::string, std::shared_ptr<xrt_core::smi::option>> validate_suboptions;
   validate_suboptions.emplace("device", std::make_shared<xrt_core::smi::option>("device", "d", "The Bus:Device.Function (e.g., 0000:d8:00.0) device of interest", "common", "", "string"));
   validate_suboptions.emplace("format", std::make_shared<xrt_core::smi::option>("format", "f", "Report output format. Valid values are:\n"
                                 "\tJSON        - Latest JSON schema\n"
@@ -40,12 +48,12 @@ create_validate_subcommand()
                               "common", "",  "array", validate_test_desc));
   validate_suboptions.emplace("path", std::make_shared<xrt_core::smi::option>("path", "p", "Path to the directory containing validate xclbins", "hidden", "", "string"));
   validate_suboptions.emplace("param", std::make_shared<xrt_core::smi::option>("param", "", "Extended parameter for a given test. Format: <test-name>:<key>:<value>", "hidden", "", "string"));
-  validate_suboptions.emplace("pmode", std::make_shared<xrt_core::smi::option>("pmode", "", "Specify which power mode to run the benchmarks in. Note: Some tests might be unavailable for some modes", "hidden", "", "string")); 
+  validate_suboptions.emplace("pmode", std::make_shared<xrt_core::smi::option>("pmode", "", "Specify which power mode to run the benchmarks in. Note: Some tests might be unavailable for some modes", "hidden", "", "string"));
 
   return {"validate", "Validates the given device by executing the platform's validate executable", "common", std::move(validate_suboptions)};
 }
 
-xrt_core::smi::subcommand
+static xrt_core::smi::subcommand
 create_examine_subcommand()
 {
   std::vector<xrt_core::smi::basic_option> examine_report_desc = {
@@ -67,7 +75,7 @@ create_examine_subcommand()
     {"thermal", "Thermal sensors present on the device", "common"}
   };
 
-  std::map<std::string, std::shared_ptr<xrt_core::smi::option>> examine_suboptions; 
+  std::map<std::string, std::shared_ptr<xrt_core::smi::option>> examine_suboptions;
   examine_suboptions.emplace("device", std::make_shared<xrt_core::smi::option>("device", "d", "The Bus:Device.Function (e.g., 0000:d8:00.0) device of interest", "common", "", "string"));
   examine_suboptions.emplace("format", std::make_shared<xrt_core::smi::option>("format", "f", "Report output format. Valid values are:\n"
                                 "\tJSON        - Latest JSON schema\n"
@@ -78,9 +86,9 @@ create_examine_subcommand()
   examine_suboptions.emplace("element", std::make_shared<xrt_core::smi::option>("element", "e", "Filters individual elements(s) from the report. Format: '/<key>/<key>/...'", "hidden", "", "array"));
 
   return {"examine", "This command will 'examine' the state of the system/device and will generate a report of interest in a text or JSON format.", "common", std::move(examine_suboptions)};
-} // namespace shim_pcie::smi
+}
 
-xrt_core::smi::subcommand
+static xrt_core::smi::subcommand
 create_configure_subcommand()
 {
   std::map<std::string, std::shared_ptr<xrt_core::smi::option>> configure_suboptions;
@@ -89,22 +97,17 @@ create_configure_subcommand()
   configure_suboptions.emplace("p2p", std::make_shared<xrt_core::smi::option>("p2p", "", "Controls P2P functionality\n", "common", "", "string", true));
   configure_suboptions.emplace("host-mem", std::make_shared<xrt_core::smi::option>("host-mem", "", "Controls host-mem functionality\n", "common", "", "string", true));
 
-
   return {"configure", "Device and host configuration", "common", std::move(configure_suboptions)};
 }
 
 std::string
 get_smi_config()
 {
-  // Get the singleton instance
   auto smi_instance = xrt_core::smi::instance();
-
-  // Add subcommands
   smi_instance->add_subcommand("validate", create_validate_subcommand());
   smi_instance->add_subcommand("examine", create_examine_subcommand());
   smi_instance->add_subcommand("configure", create_configure_subcommand());
-
   return smi_instance->build_json();
 }
 
-} // namespace shim_pcie::smi
+} // namespace xrt_core::smi::alveo
diff --git a/src/runtime_src/core/common/smi/smi_alveo.h b/src/runtime_src/core/common/smi/smi_alveo.h
new file mode 100644
index 00000000000..8fe3301f892
--- /dev/null
+++ b/src/runtime_src/core/common/smi/smi_alveo.h
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.
+#pragma once
+
+#include <string>
+
+namespace xrt_core::smi::alveo {
+
+// xrt-smi JSON for Alveo-class shims (PCIe Linux and edge user device_linux).
+std::string
+get_smi_config();
+
+} // namespace xrt_core::smi::alveo
diff --git a/src/runtime_src/core/common/smi/smi_ryzen.cpp b/src/runtime_src/core/common/smi/smi_ryzen.cpp
new file mode 100644
index 00000000000..bde11eba6d4
--- /dev/null
+++ b/src/runtime_src/core/common/smi/smi_ryzen.cpp
@@ -0,0 +1,159 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.
+
+#include "core/common/smi/smi_ryzen.h"
+
+#include "core/common/query_requests.h"
+
+using namespace xrt_core::smi;
+
+namespace xrt_core::smi::ryzen {
+
+config_gen_ryzen::
+config_gen_ryzen()
+{
+  validate_test_desc = {
+    {"aie-reconfig-overhead", "Run end-to-end array reconfiguration overhead through shim DMA", "hidden"},
+    {"all", "All applicable validate tests will be executed (default)", "common"},
+    {"cmd-chain-latency", "Run end-to-end latency test using command chaining", "hidden"},
+    {"cmd-chain-throughput", "Run end-to-end throughput test using command chaining", "hidden"},
+    {"df-bw", "Run bandwidth test on data fabric", "hidden"},
+    {"gemm", "Measure the TOPS value of GEMM INT8operations", "common"},
+    {"latency", "Run end-to-end latency test", "common"},
+    {"quick", "Run a subset of four tests: \n1. latency \n2. throughput \n3. cmd-chain-latency \n4. cmd-chain-throughput", "hidden"},
+    {"tct-all-col", "Measure average TCT processing time for all columns", "hidden"},
+    {"tct-one-col", "Measure average TCT processing time for one column", "hidden"},
+    {"throughput", "Run end-to-end throughput test", "common"},
+    {"temporal-sharing-overhead", "Run end-to-end temporal sharing overhead test", "hidden"},
+    {"preemption-overhead", "Measure preemption overhead at noop and memtile levels", "hidden"}
+  };
+}
+
+config_gen_phoenix::
+config_gen_phoenix()
+{
+  validate_test_desc = {
+    {"all", "All applicable validate tests will be executed (default)", "common"},
+    {"df-bw", "Run bandwidth test on data fabric", "hidden"},
+    {"latency", "Run end-to-end latency test", "common"},
+    {"tct-all-col", "Measure average TCT processing time for all columns", "hidden"},
+    {"tct-one-col", "Measure average TCT processing time for one column", "hidden"},
+    {"throughput", "Run end-to-end throughput test", "common"},
+  };
+}
+
+subcommand
+config_gen_ryzen::create_validate_subcommand()
+{
+  std::map<std::string, std::shared_ptr<option>> validate_suboptions;
+  validate_suboptions.emplace("device", std::make_shared<option>("device", "d", "The Bus:Device.Function (e.g., 0000:d8:00.0) device of interest", "common", "", "string"));
+  validate_suboptions.emplace("format", std::make_shared<option>("format", "f", "Report output format. Valid values are:\n"
+                                "\tJSON        - Latest JSON schema\n"
+                                "\tJSON-2020.2 - JSON 2020.2 schema", "common", "JSON", "string"));
+  validate_suboptions.emplace("output", std::make_shared<option>("output", "o", "Direct the output to the given file", "common", "", "string"));
+  validate_suboptions.emplace("help", std::make_shared<option>("help", "h", "Help to use this sub-command", "common", "", "none"));
+  validate_suboptions.emplace("run", std::make_shared<listable_description_option>("run", "r", "Run a subset of the test suite. Valid options are:\n",
+                              "common", "",  "array", get_validate_test_desc()));
+  validate_suboptions.emplace("param", std::make_shared<option>("param", "", "Extended parameter for a given test. Format: <test-name>:<key>:<value>", "param", "", "string"));
+  validate_suboptions.emplace("pmode", std::make_shared<option>("pmode", "", "Specify which power mode to run the benchmarks in. Note: Some tests might be unavailable for some modes", "hidden", "", "string"));
+  validate_suboptions.emplace("loop", std::make_shared<option>("loop", "", "Number of iterations to run the test", "hidden", "", "string"));
+
+  return {"validate", "Validates the given device by executing the platform's validate executable", "common", std::move(validate_suboptions)};
+}
+
+subcommand
+config_gen_ryzen::create_examine_subcommand()
+{
+  std::vector<basic_option> examine_report_desc = {
+    {"aie-partitions", "AIE partition information", "common"},
+    {"all", "All known reports are produced", "common"},
+    {"host", "Host information (default)", "common"},
+    {"platform", "Platforms flashed on the device", "common"},
+    {"telemetry", "Telemetry data for the device", "hidden"},
+    {"preemption", "Preemption telemetry data for the device", "hidden"},
+    {"clocks", "Clock frequency information", "hidden"}
+  };
+
+  std::map<std::string, std::shared_ptr<option>> examine_suboptions;
+  examine_suboptions.emplace("device", std::make_shared<option>("device", "d", "The Bus:Device.Function (e.g., 0000:d8:00.0) device of interest", "common", "", "string"));
+  examine_suboptions.emplace("format", std::make_shared<option>("format", "f", "Report output format. Valid values are:\n"
+                                "\tJSON        - Latest JSON schema\n"
+                                "\tJSON-2020.2 - JSON 2020.2 schema", "common", "JSON", "string"));
+  examine_suboptions.emplace("output", std::make_shared<option>("output", "o", "Direct the output to the given file", "common", "", "string"));
+  examine_suboptions.emplace("help", std::make_shared<option>("help", "h", "Help to use this sub-command", "common", "", "none"));
+  examine_suboptions.emplace("watch", std::make_shared<option>("watch", "", "Refresh interval in seconds between examine updates. Exit with Ctrl+C.", "hidden", "0", "string"));
+  examine_suboptions.emplace("report", std::make_shared<listable_description_option>("report", "r", "The type of report to be produced. Reports currently available are:\n", "common", "", "array", examine_report_desc));
+  examine_suboptions.emplace("firmware-log", std::make_shared<option>("firmware-log", "", "Show status|watch firmware log data", "hidden", "", "string", true));
+  examine_suboptions.emplace("event-trace", std::make_shared<option>("event-trace", "", "Show status|watch event trace data", "hidden", "", "string", true));
+  examine_suboptions.emplace("context-health", std::make_shared<option>("context-health", "", "Show status|watch context health data", "hidden", "", "string", true));
+
+  return {"examine", "This command will 'examine' the state of the system/device and will generate a report of interest in a text or JSON format.", "common", std::move(examine_suboptions)};
+}
+
+subcommand
+config_gen_ryzen::create_configure_subcommand()
+{
+  std::map<std::string, std::shared_ptr<option>> configure_suboptions;
+  configure_suboptions.emplace("device", std::make_shared<option>("device", "d", "The Bus:Device.Function (e.g., 0000:d8:00.0) device of interest", "common", "", "string"));
+  configure_suboptions.emplace("help", std::make_shared<option>("help", "h", "Help to use this sub-command", "common", "", "none"));
+  configure_suboptions.emplace("pmode", std::make_shared<option>("pmode", "", "Modes: default, powersaver, balanced, performance, turbo", "common", "", "string", true));
+  configure_suboptions.emplace("force-preemption", std::make_shared<option>("force-preemption", "", "Force enable|disable and see status of preemption", "hidden", "", "string", true));
+  configure_suboptions.emplace("event-trace", std::make_shared<option>("event-trace", "", "Enable|disable event tracing", "hidden", "", "string", true));
+  configure_suboptions.emplace("firmware-log", std::make_shared<option>("firmware-log", "", "Enable|disable firmware logging", "hidden", "", "string", true));
+
+  return {"configure", "Device and host configuration", "common", std::move(configure_suboptions)};
+}
+
+void
+populate_smi_instance(xrt_core::smi::smi* smi_instance, const xrt_core::device* device)
+{
+  smi_hardware_config smi_hrdw;
+  const auto pcie_id = xrt_core::device_query<xrt_core::query::pcie_id>(device);
+  auto hardware_type = smi_hrdw.get_hardware_type(pcie_id);
+
+  std::shared_ptr<config_generator> generator;
+
+  switch (hardware_type) {
+  case smi_hardware_config::hardware_type::phx:
+  {
+    generator = std::make_shared<config_gen_phoenix>();
+    break;
+  }
+  case smi_hardware_config::hardware_type::stxA0:
+  case smi_hardware_config::hardware_type::stxB0:
+  case smi_hardware_config::hardware_type::stxH:
+  case smi_hardware_config::hardware_type::krk1:
+  {
+    generator = std::make_shared<config_gen_strix>();
+    break;
+  }
+  case smi_hardware_config::hardware_type::npu3_f1:
+  case smi_hardware_config::hardware_type::npu3_f2:
+  case smi_hardware_config::hardware_type::npu3_f3:
+  {
+    generator = std::make_shared<config_gen_npu3>();
+    break;
+  }
+  default:
+    generator = std::make_shared<config_gen_strix>();
+    break;
+  }
+
+  if (generator) {
+    smi_instance->add_subcommand("validate",  generator->create_validate_subcommand());
+    smi_instance->add_subcommand("examine",  generator->create_examine_subcommand());
+    smi_instance->add_subcommand("configure",  generator->create_configure_subcommand());
+  }
+}
+
+std::string
+get_smi_config(const xrt_core::device* device)
+{
+  auto smi_instance = xrt_core::smi::instance();
+
+  populate_smi_instance(smi_instance, device);
+
+  return smi_instance->build_json();
+}
+
+} // namespace xrt_core::smi::ryzen
diff --git a/src/runtime_src/core/common/smi/smi_ryzen.h b/src/runtime_src/core/common/smi/smi_ryzen.h
new file mode 100644
index 00000000000..12e1e705e04
--- /dev/null
+++ b/src/runtime_src/core/common/smi/smi_ryzen.h
@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "core/common/device.h"
+#include "core/common/smi/smi.h"
+
+namespace xrt_core::smi::ryzen {
+
+// Ryzen / NPU xrt-smi JSON config generators (shared by XDNA shim, MCDM, etc.).
+class config_gen_ryzen : public xrt_core::smi::config_generator {
+  std::vector<xrt_core::smi::basic_option> validate_test_desc;
+
+public:
+  config_gen_ryzen();
+
+  virtual const std::vector<xrt_core::smi::basic_option>&
+  get_validate_test_desc() const
+  {
+    return validate_test_desc;
+  }
+
+  xrt_core::smi::subcommand
+  create_validate_subcommand() override;
+
+  xrt_core::smi::subcommand
+  create_examine_subcommand() override;
+
+  xrt_core::smi::subcommand
+  create_configure_subcommand() override;
+};
+
+class config_gen_phoenix : public config_gen_ryzen {
+  std::vector<xrt_core::smi::basic_option> validate_test_desc;
+
+public:
+  config_gen_phoenix();
+
+  const std::vector<xrt_core::smi::basic_option>&
+  get_validate_test_desc() const override
+  {
+    return validate_test_desc;
+  }
+};
+
+class config_gen_strix : public config_gen_ryzen {
+};
+
+class config_gen_npu3 : public config_gen_ryzen {
+};
+
+void
+populate_smi_instance(xrt_core::smi::smi* smi_instance, const xrt_core::device* device);
+
+std::string
+get_smi_config(const xrt_core::device* device);
+
+} // namespace xrt_core::smi::ryzen
diff --git a/src/runtime_src/core/edge/hw_emu/CMakeLists.txt b/src/runtime_src/core/edge/hw_emu/CMakeLists.txt
index 9ed25f23c12..c7c678d1611 100644
--- a/src/runtime_src/core/edge/hw_emu/CMakeLists.txt
+++ b/src/runtime_src/core/edge/hw_emu/CMakeLists.txt
@@ -58,6 +58,7 @@ set(AIE_TARGET_EXISTS "$<TARGET_EXISTS:core_edge_user_aie_object_hw_em>")
 
 add_library(xrt_hwemu SHARED ${EM_SRC_FILES}
   $<TARGET_OBJECTS:core_edgeuser_plugin_xdp_hw_em_objects>
+  $<TARGET_OBJECTS:core_smi_alveo_objects>
   $<TARGET_OBJECTS:core_common_objects>
   $<TARGET_OBJECTS:core_edge_common_objects>
   $<$<AND:${AIE_BUILD_DEFINED},${AIE_TARGET_EXISTS}>:$<TARGET_OBJECTS:core_edge_user_aie_object_hw_em>>
diff --git a/src/runtime_src/core/edge/user/CMakeLists.txt b/src/runtime_src/core/edge/user/CMakeLists.txt
index 0aeb971ce2e..59fb88f5eb4 100644
--- a/src/runtime_src/core/edge/user/CMakeLists.txt
+++ b/src/runtime_src/core/edge/user/CMakeLists.txt
@@ -31,6 +31,7 @@ set(AIE_TARGET_EXISTS "$<TARGET_EXISTS:core_edge_user_aie_object>")
 
 add_library(xrt_core SHARED ${XRT_EDGE_USER_FILES}
   $<TARGET_OBJECTS:core_edgeuser_plugin_xdp_objects>
+  $<TARGET_OBJECTS:core_smi_alveo_objects>
   $<TARGET_OBJECTS:core_common_objects>
   $<TARGET_OBJECTS:core_edge_common_objects>
   $<$<AND:${AIE_BUILD_DEFINED},${AIE_TARGET_EXISTS}>:$<TARGET_OBJECTS:core_edge_user_aie_object>>
@@ -38,6 +39,7 @@ add_library(xrt_core SHARED ${XRT_EDGE_USER_FILES}
 
 add_library(xrt_core_static STATIC ${XRT_EDGE_USER_FILES}
   $<TARGET_OBJECTS:core_edgeuser_plugin_xdp_no_dl_load_objects>
+  $<TARGET_OBJECTS:core_smi_alveo_objects>
   $<TARGET_OBJECTS:core_common_objects>
   $<TARGET_OBJECTS:core_edge_common_objects>
   $<$<AND:${AIE_BUILD_DEFINED},${AIE_TARGET_EXISTS}>:$<TARGET_OBJECTS:core_edge_user_aie_object>>
diff --git a/src/runtime_src/core/edge/user/device_linux.cpp b/src/runtime_src/core/edge/user/device_linux.cpp
index 4c035d9c081..14fd0732b9d 100644
--- a/src/runtime_src/core/edge/user/device_linux.cpp
+++ b/src/runtime_src/core/edge/user/device_linux.cpp
@@ -5,7 +5,8 @@
 #include "xrt.h"
 #include "dev_zocl.h"
 #include "aie_sys_parser.h"
-#include "smi_edge.h"
+#include "core/common/smi/smi.h"
+#include "core/common/smi/smi_alveo.h"
 #include "system_linux.h"
 
 #include "core/common/debug_ip.h"
@@ -754,7 +755,7 @@ struct xrt_smi_config
     const auto xrt_smi_config_type = std::any_cast<xrt_core::query::xrt_smi_config::type>(reqType);
     switch (xrt_smi_config_type) {
     case xrt_core::query::xrt_smi_config::type::options_config:
-      xrt_smi_config = shim_edge::smi::get_smi_config();
+      xrt_smi_config = xrt_core::smi::alveo::get_smi_config();
       break;
     default:
       throw xrt_core::query::no_such_key(key, "Not implemented");
diff --git a/src/runtime_src/core/edge/user/smi_edge.cpp b/src/runtime_src/core/edge/user/smi_edge.cpp
deleted file mode 100644
index 80e7994aca2..00000000000
--- a/src/runtime_src/core/edge/user/smi_edge.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-// Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.
-#include "smi_edge.h"
-
-namespace shim_edge::smi {
-
-xrt_core::smi::subcommand
-create_validate_subcommand()
-{
-  std::vector<xrt_core::smi::basic_option> validate_test_desc = {
-    {"all", "All applicable validate tests will be executed (default)", "common"},
-    {"aie", "Run AIE PL test", "common"},
-    {"aux-connection", "Check if auxiliary power is connected", "common"},
-    {"bist", "Run built-in self test", "common"},
-    {"dma", "Run dma test", "common"},
-    {"hostmem-bw", "Run 'bandwidth kernel' when host memory is enabled", "common"},
-    {"iops", "Run Input/Output operations per second test", "common"},
-    {"m2m", "Run M2M test", "common"},
-    {"mem-bw", "Run 'bandwidth kernel' and check the throughput", "common"},
-    {"p2p", "Run P2P test", "common"},
-    {"pcie-link", "Check if PCIE link is active", "common"},
-    {"ps-aie", "Run PS controlled AIE test", "common"},
-    {"ps-iops", "Run IOPS PS test", "common"},
-    {"ps-pl-verify", "Run PS controlled 'Hello World' PL kernel test", "common"},
-    {"ps-verify", "Run 'Hello World' PS kernel test", "common"},
-    {"sc-version","Check if SC firmware is up-to-date", "common"},
-    {"vcu", "Run VCU test", "common"},
-    {"verify", "Run 'Hello World' kernel test", "common"}
-  };
-
-   std::map<std::string, std::shared_ptr<xrt_core::smi::option>> validate_suboptions;
-  validate_suboptions.emplace("device", std::make_shared<xrt_core::smi::option>("device", "d", "The Bus:Device.Function (e.g., 0000:d8:00.0) device of interest", "common", "", "string"));
-  validate_suboptions.emplace("format", std::make_shared<xrt_core::smi::option>("format", "f", "Report output format. Valid values are:\n"
-                                "\tJSON        - Latest JSON schema\n"
-                                "\tJSON-2020.2 - JSON 2020.2 schema", "common", "JSON", "string"));
-  validate_suboptions.emplace("output", std::make_shared<xrt_core::smi::option>("output", "o", "Direct the output to the given file", "common", "", "string"));
-  validate_suboptions.emplace("help", std::make_shared<xrt_core::smi::option>("help", "h", "Help to use this sub-command", "common", "", "none"));
-  validate_suboptions.emplace("run", std::make_shared<xrt_core::smi::listable_description_option>("run", "r", "Run a subset of the test suite. Valid options are:\n",
-                              "common", "",  "array", validate_test_desc));
-  validate_suboptions.emplace("path", std::make_shared<xrt_core::smi::option>("path", "p", "Path to the directory containing validate xclbins", "hidden", "", "string"));
-  validate_suboptions.emplace("param", std::make_shared<xrt_core::smi::option>("param", "", "Extended parameter for a given test. Format: <test-name>:<key>:<value>", "hidden", "", "string"));
-  validate_suboptions.emplace("pmode", std::make_shared<xrt_core::smi::option>("pmode", "", "Specify which power mode to run the benchmarks in. Note: Some tests might be unavailable for some modes", "hidden", "", "string")); 
-
-  return {"validate", "Validates the given device by executing the platform's validate executable", "common", std::move(validate_suboptions)};
-}
-
-xrt_core::smi::subcommand
-create_examine_subcommand()
-{
-  std::vector<xrt_core::smi::basic_option> examine_report_desc = {
-    {"aie", "AIE metadata in xclbin", "common"},
-    {"aiemem", "AIE memory tile information", "common"},
-    {"aieshim", "AIE shim tile status", "common"},
-    {"debug-ip-status", "Status of Debug IPs present in xclbin loaded on device", "common"},
-    {"dynamic-regions", "Information about the xclbin and the compute units", "common"},
-    {"electrical", "Electrical and power sensors present on the device", "common"},
-    {"error", "Asyncronus Error present on the device", "common"},
-    {"firewall", "Firewall status", "common"},
-    {"host", "Host information", "common"},
-    {"mailbox", "Mailbox metrics of the device", "common"},
-    {"mechanical", "Mechanical sensors on and surrounding the device", "common"},
-    {"memory", "Memory information present on the device", "common"},
-    {"pcie-info", "Pcie information of the device", "common"},
-    {"platform", "Platforms flashed on the device", "common"},
-    {"qspi-status", "QSPI write protection status", "common"},
-    {"thermal", "Thermal sensors present on the device", "common"}
-  };
-
-  std::map<std::string, std::shared_ptr<xrt_core::smi::option>> examine_suboptions; 
-  examine_suboptions.emplace("device", std::make_shared<xrt_core::smi::option>("device", "d", "The Bus:Device.Function (e.g., 0000:d8:00.0) device of interest", "common", "", "string"));
-  examine_suboptions.emplace("format", std::make_shared<xrt_core::smi::option>("format", "f", "Report output format. Valid values are:\n"
-                                "\tJSON        - Latest JSON schema\n"
-                                "\tJSON-2020.2 - JSON 2020.2 schema", "common", "JSON", "string"));
-  examine_suboptions.emplace("output", std::make_shared<xrt_core::smi::option>("output", "o", "Direct the output to the given file", "common", "", "string"));
-  examine_suboptions.emplace("help", std::make_shared<xrt_core::smi::option>("help", "h", "Help to use this sub-command", "common", "", "none"));
-  examine_suboptions.emplace("report", std::make_shared<xrt_core::smi::listable_description_option>("report", "r", "The type of report to be produced. Reports currently available are:\n", "common", "", "array", examine_report_desc));
-  examine_suboptions.emplace("element", std::make_shared<xrt_core::smi::option>("element", "e", "Filters individual elements(s) from the report. Format: '/<key>/<key>/...'", "hidden", "", "array"));
-
-  return {"examine", "This command will 'examine' the state of the system/device and will generate a report of interest in a text or JSON format.", "common", std::move(examine_suboptions)};
-} // namespace shim_pcie::smi
-
-xrt_core::smi::subcommand
-create_configure_subcommand()
-{
-  std::map<std::string, std::shared_ptr<xrt_core::smi::option>> configure_suboptions;
-  configure_suboptions.emplace("device", std::make_shared<xrt_core::smi::option>("device", "d", "The Bus:Device.Function (e.g., 0000:d8:00.0) device of interest", "common", "", "string"));
-  configure_suboptions.emplace("help", std::make_shared<xrt_core::smi::option>("help", "h", "Help to use this sub-command", "common", "", "none"));
-  configure_suboptions.emplace("p2p", std::make_shared<xrt_core::smi::option>("p2p", "", "Controls P2P functionality\n", "common", "", "string", true));
-  configure_suboptions.emplace("host-mem", std::make_shared<xrt_core::smi::option>("host-mem", "", "Controls host-mem functionality\n", "common", "", "string", true));
-
-  return {"configure", "Device and host configuration", "common", std::move(configure_suboptions)};
-}
-
-std::string
-get_smi_config()
-{
-  // Get the singleton instance
-  auto smi_instance = xrt_core::smi::instance();
-
-  // Add subcommands
-  smi_instance->add_subcommand("validate", create_validate_subcommand());
-  smi_instance->add_subcommand("examine", create_examine_subcommand());
-  smi_instance->add_subcommand("configure", create_configure_subcommand());
-
-  return smi_instance->build_json();
-}
-
-} // namespace shim_edge::smi
diff --git a/src/runtime_src/core/edge/user/smi_edge.h b/src/runtime_src/core/edge/user/smi_edge.h
deleted file mode 100644
index efe68983f5d..00000000000
--- a/src/runtime_src/core/edge/user/smi_edge.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-// Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.
-
-#include <string>
-#include "core/common/smi.h"
-
-namespace shim_edge::smi {
-
-std::string 
-get_smi_config();
-
-} // namespace shim_edge::smi
diff --git a/src/runtime_src/core/pcie/linux/CMakeLists.txt b/src/runtime_src/core/pcie/linux/CMakeLists.txt
index 8a45f57d8e1..aa4a27312a0 100644
--- a/src/runtime_src/core/pcie/linux/CMakeLists.txt
+++ b/src/runtime_src/core/pcie/linux/CMakeLists.txt
@@ -16,7 +16,6 @@ add_library(core_pcielinux_objects OBJECT
   pcidev.cpp
   pcidrv.cpp
   shim.cpp
-  smi_pcie.cpp
   system_linux.cpp
   )
 
@@ -36,6 +35,7 @@ target_include_directories(core_pcielinux_objects
 add_library(xrt_core SHARED
   $<TARGET_OBJECTS:core_pcielinux_plugin_xdp_objects>
   $<TARGET_OBJECTS:core_pcielinux_objects>
+  $<TARGET_OBJECTS:core_smi_alveo_objects>
   $<TARGET_OBJECTS:core_pciecommon_objects>
   $<TARGET_OBJECTS:core_common_objects>
   )
@@ -43,6 +43,7 @@ add_library(xrt_core SHARED
 add_library(xrt_core_static STATIC
   $<TARGET_OBJECTS:core_pcielinux_plugin_xdp_objects>
   $<TARGET_OBJECTS:core_pcielinux_objects>
+  $<TARGET_OBJECTS:core_smi_alveo_objects>
   $<TARGET_OBJECTS:core_pciecommon_objects>
   $<TARGET_OBJECTS:core_common_objects>
   )
diff --git a/src/runtime_src/core/pcie/linux/device_linux.cpp b/src/runtime_src/core/pcie/linux/device_linux.cpp
index 9114fa7e4a4..56c5f3d1634 100644
--- a/src/runtime_src/core/pcie/linux/device_linux.cpp
+++ b/src/runtime_src/core/pcie/linux/device_linux.cpp
@@ -17,7 +17,8 @@
 #include "core/include/xdp/spc.h"
 #include "core/pcie/driver/linux/include/mgmt-ioctl.h"
 
-#include "smi_pcie.h"
+#include "core/common/smi/smi.h"
+#include "core/common/smi/smi_alveo.h"
 #include "pcidev.h"
 #include "xrt.h"
 
@@ -921,7 +922,7 @@ struct xrt_smi_config
     const auto xrt_smi_config_type = std::any_cast<xrt_core::query::xrt_smi_config::type>(reqType);
     switch (xrt_smi_config_type) {
     case xrt_core::query::xrt_smi_config::type::options_config:
-      xrt_smi_config = shim_pcie::smi::get_smi_config();
+      xrt_smi_config = xrt_core::smi::alveo::get_smi_config();
       break;
     default:
       throw xrt_core::query::no_such_key(key, "Not implemented");
diff --git a/src/runtime_src/core/pcie/linux/smi_pcie.h b/src/runtime_src/core/pcie/linux/smi_pcie.h
deleted file mode 100644
index 402e4b75744..00000000000
--- a/src/runtime_src/core/pcie/linux/smi_pcie.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-// Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.
-
-#include <string>
-#include "core/common/smi.h"
-
-namespace shim_pcie::smi {
-
-  std::string 
-  get_smi_config();
-
-} // namespace shim_pcie::smi
diff --git a/src/runtime_src/core/tools/common/SmiDefault.cpp b/src/runtime_src/core/tools/common/SmiDefault.cpp
index b174bd33d0a..bce62e6a8c0 100644
--- a/src/runtime_src/core/tools/common/SmiDefault.cpp
+++ b/src/runtime_src/core/tools/common/SmiDefault.cpp
@@ -5,7 +5,7 @@
 
 #define XRT_CORE_COMMON_SOURCE
 
-#include "core/common/smi.h"
+#include "core/common/smi/smi.h"
 #include "SmiDefault.h"
 
 #include <boost/property_tree/ptree.hpp>
@@ -39,7 +39,7 @@ xrt_core::smi::subcommand
 create_examine_subcommand() 
 {
   std::vector<xrt_core::smi::basic_option> examine_report_desc = {
-    {"host", "Host information", "common"},
+    {"host", "Host information (default)", "common"},
   };
   std::map<std::string, std::shared_ptr<xrt_core::smi::option>> examine_suboptions; 
   examine_suboptions.emplace("device", std::make_shared<xrt_core::smi::option>("device", "d", "The Bus:Device.Function (e.g., 0000:d8:00.0) device of interest", "common", "", "string"));
diff --git a/src/runtime_src/core/tools/common/XBMain.cpp b/src/runtime_src/core/tools/common/XBMain.cpp
index a9410c24e79..6825a235f8d 100644
--- a/src/runtime_src/core/tools/common/XBMain.cpp
+++ b/src/runtime_src/core/tools/common/XBMain.cpp
@@ -6,7 +6,7 @@
 // Local - Include Files
 #include "core/common/system.h"
 #include "core/common/sysinfo.h"
-#include "core/common/smi.h"
+#include "core/common/smi/smi.h"
 #include "SmiDefault.h"
 #include "SubCmd.h"
 #include "XBHelpMenusCore.h"
diff --git a/src/runtime_src/core/tools/common/XBUtilities.cpp b/src/runtime_src/core/tools/common/XBUtilities.cpp
index 401022372d3..966f43ad6db 100644
--- a/src/runtime_src/core/tools/common/XBUtilities.cpp
+++ b/src/runtime_src/core/tools/common/XBUtilities.cpp
@@ -13,7 +13,7 @@
 #include "common/message.h"
 #include "common/system.h"
 #include "common/sysinfo.h"
-#include "common/smi.h"
+#include "common/smi/smi.h"
 #include "common/module_loader.h"
 #include "xrt/detail/version-slim.h"
 
diff --git a/src/runtime_src/core/tools/common/XBUtilities.h b/src/runtime_src/core/tools/common/XBUtilities.h
index 6ca504c30f6..9b8015aa7ab 100644
--- a/src/runtime_src/core/tools/common/XBUtilities.h
+++ b/src/runtime_src/core/tools/common/XBUtilities.h
@@ -11,7 +11,7 @@
 #include "core/common/query_requests.h"
 #include "core/common/archive.h"
 #include "core/common/runner/runner.h"
-#include "core/common/smi.h"
+#include "core/common/smi/smi.h"
 
 #include <chrono>
 #include <iostream>
diff --git a/src/runtime_src/core/tools/common/tests/TestGemm.cpp b/src/runtime_src/core/tools/common/tests/TestGemm.cpp
index 4de715449af..6a165e4eadd 100644
--- a/src/runtime_src/core/tools/common/tests/TestGemm.cpp
+++ b/src/runtime_src/core/tools/common/tests/TestGemm.cpp
@@ -12,7 +12,7 @@
 #include "xrt/experimental/xrt_ext.h"
 #include "core/common/runner/runner.h"
 #include "core/common/archive.h"
-#include "core/common/smi.h"
+#include "core/common/smi/smi.h"
 #include "core/common/api/bo_int.h"
 #include "xrt/detail/xclbin.h"
 
diff --git a/src/runtime_src/core/tools/common/tests/TestPreeemptionOverhead.cpp b/src/runtime_src/core/tools/common/tests/TestPreeemptionOverhead.cpp
index fb9338a7a78..5b9a575184c 100644
--- a/src/runtime_src/core/tools/common/tests/TestPreeemptionOverhead.cpp
+++ b/src/runtime_src/core/tools/common/tests/TestPreeemptionOverhead.cpp
@@ -11,7 +11,7 @@
 #include "core/common/runner/runner.h"
 #include "core/common/json/nlohmann/json.hpp"
 #include "core/common/archive.h"
-#include "core/common/smi.h"
+#include "core/common/smi/smi.h"
 
 namespace XBU = XBValidateUtils;
 namespace xq = xrt_core::query;
diff --git a/src/runtime_src/core/tools/xbutil2/ContextHealth/OO_ContextHealth.cpp b/src/runtime_src/core/tools/xbutil2/ContextHealth/OO_ContextHealth.cpp
index d89367bf78d..913f1199e20 100644
--- a/src/runtime_src/core/tools/xbutil2/ContextHealth/OO_ContextHealth.cpp
+++ b/src/runtime_src/core/tools/xbutil2/ContextHealth/OO_ContextHealth.cpp
@@ -10,7 +10,7 @@
 #include "tools/common/SmiWatchMode.h"
 #include "tools/common/Table2D.h"
 #include "core/common/query_requests.h"
-#include "core/common/smi.h"
+#include "core/common/smi/smi.h"
 
 // 3rd Party Library - Include Files
 #include <boost/program_options.hpp>
diff --git a/src/runtime_src/core/tools/xbutil2/SubCmdConfigure.h b/src/runtime_src/core/tools/xbutil2/SubCmdConfigure.h
index d7b9b9be0c9..e6cef63b34d 100644
--- a/src/runtime_src/core/tools/xbutil2/SubCmdConfigure.h
+++ b/src/runtime_src/core/tools/xbutil2/SubCmdConfigure.h
@@ -9,7 +9,7 @@
 #include "tools/common/SubCmd.h"
 #include "tools/common/SubCmdConfigureInternal.h"
 #include "tools/common/OptionOptions.h"
-#include "core/common/smi.h"
+#include "core/common/smi/smi.h"
 struct SubCmdConfigureOptions {
 
   // Common options
diff --git a/src/runtime_src/core/tools/xbutil2/SubCmdExamine.h b/src/runtime_src/core/tools/xbutil2/SubCmdExamine.h
index d218b54e1f6..5d1af47c4d9 100644
--- a/src/runtime_src/core/tools/xbutil2/SubCmdExamine.h
+++ b/src/runtime_src/core/tools/xbutil2/SubCmdExamine.h
@@ -8,7 +8,7 @@
 #include "tools/common/SubCmd.h"
 #include "tools/common/Report.h"
 #include "tools/common/OptionOptions.h"
-#include "core/common/smi.h"
+#include "core/common/smi/smi.h"
 
 // 3rd Party Library - Include Files
 #include <boost/property_tree/ptree.hpp>
diff --git a/src/runtime_src/core/tools/xbutil2/SubCmdValidate.cpp b/src/runtime_src/core/tools/xbutil2/SubCmdValidate.cpp
index 6a13c64f2a9..43770e39054 100644
--- a/src/runtime_src/core/tools/xbutil2/SubCmdValidate.cpp
+++ b/src/runtime_src/core/tools/xbutil2/SubCmdValidate.cpp
@@ -425,12 +425,7 @@ SubCmdValidate::handle_errors_and_validate_tests(const boost::program_options::v
 
   auto testsToRun = options.m_tests_to_run;
   if (testsToRun.empty()) {
-    if (!XBU::getAdvance()) {
-      testsToRun = std::vector<std::string>({"all"});
-    }
-    else {
-      throw xrt_core::error("No test given to validate against.");
-    }
+    testsToRun = std::vector<std::string>({"all"});
   }
   // Validate the user test requests
   for (auto &userTestName : testsToRun) {
diff --git a/src/runtime_src/core/tools/xbutil2/SubCmdValidate.h b/src/runtime_src/core/tools/xbutil2/SubCmdValidate.h
index 2c03f890d14..ded68ed4a92 100644
--- a/src/runtime_src/core/tools/xbutil2/SubCmdValidate.h
+++ b/src/runtime_src/core/tools/xbutil2/SubCmdValidate.h
@@ -11,7 +11,7 @@
 #include "tools/common/SubCmd.h"
 #include "tools/common/XBHelpMenus.h"
 #include "tools/common/TestRunner.h"
-#include "core/common/smi.h"
+#include "core/common/smi/smi.h"
 
 struct SubCmdValidateOptions {
   std::string m_device;
diff --git a/src/runtime_src/xdp b/src/runtime_src/xdp
index 4f426595bb2..7ff61fa2ceb 160000
--- a/src/runtime_src/xdp
+++ b/src/runtime_src/xdp
@@ -1 +1 @@
-Subproject commit 4f426595bb2f38e8a3ea1df10744eccd0559597d
+Subproject commit 7ff61fa2ceb24f21cd04642c3c2e700f642abe0f