AIESW-26143 Fix advanced disclaimer usage (Xilinx#9654)

* AIESW-26143 Fix advanced disclaimer usage

Signed-off-by: Ryan Chane <rchane@xilinx.com>

* Update isUsingAdvanced to check advanced internally

Signed-off-by: Ryan Chane <rchane@xilinx.com>

* Check for options in examine for disclaimer

Signed-off-by: Ryan Chane <rchane@xilinx.com>

* Revert previous change and move disclaimer to OptionOption level

Signed-off-by: Ryan Chane <rchane@xilinx.com>

* Move disclaimer to OptionOption level for SubCmdConfigure

Signed-off-by: Ryan Chane <rchane@xilinx.com>

* Update copyright and fix duplicate disclaimer

Signed-off-by: Ryan Chane <rchane@xilinx.com>

---------

Signed-off-by: Ryan Chane <rchane@xilinx.com>

Author: rchane

src/runtime_src/core/tools/common/XBMain.cpp

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2019-2022 Xilinx, Inc
-// Copyright (C) 2022-2025 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (C) 2022-2026 Advanced Micro Devices, Inc. All rights reserved.
 
 // ------ I N C L U D E   F I L E S -------------------------------------------
 // Local - Include Files
@@ -225,14 +225,6 @@ void  main_(int argc, char** argv,
     std::istringstream command_config_stream(config);
     boost::property_tree::read_json(command_config_stream, configTreeMain);
     subCommand->setOptionConfig(configTreeMain);
-
-    if (XBU::getAdvance()) {
-      std::cout << "-------------------------------------------------------------------------\n";
-      std::cout << "                    DISCLAIMER  (xrt-smi --advanced)                     \n";
-      std::cout << "You are running a developer command that may change system configuration.\n";
-      std::cout << "                Continue only if you understand the risks.               \n";
-      std::cout << "-------------------------------------------------------------------------\n";
-    }
   }
 
   // -- Execute the sub-command

src/runtime_src/core/tools/common/XBUtilities.cpp

@@ -954,3 +954,39 @@ get_archive_install_path(const std::string& xrt_version)
 
   return std::string(home) + "/.local/share/xrt/" + xrt_version + "/amdxdna/bins";
 }
+
+void
+XBUtilities::
+printAdvancedDisclaimer()
+{
+  std::cout << "-------------------------------------------------------------------------\n";
+  std::cout << "                    DISCLAIMER  (xrt-smi --advanced)                     \n";
+  std::cout << "You are running a developer command that may change system configuration.\n";
+  std::cout << "                Continue only if you understand the risks.               \n";
+  std::cout << "-------------------------------------------------------------------------\n";
+}
+
+bool
+XBUtilities::
+isUsingAdvanced(
+    const std::vector<std::tuple<std::string, std::string, std::string>>& configItems,
+    const std::vector<std::string>& requestedNames)
+{
+  // If advanced is not set, return false immediately
+  if (!getAdvance())
+    return false;
+
+  for (const auto& name : requestedNames) {
+    if (name == "all")
+      return true;
+  }
+
+  // Check if any specific requested item is hidden
+  for (const auto& name : requestedNames) {
+    for (const auto& item : configItems) {
+      if (std::get<0>(item) == name && std::get<2>(item) == "hidden")
+        return true;
+    }
+  }
+  return false;
+}

src/runtime_src/core/tools/common/XBUtilities.h

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2019-2022 Xilinx, Inc
-// Copyright (C) 2022-2024 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (C) 2022-2026 Advanced Micro Devices, Inc. All rights reserved.
 
 #ifndef __XBUtilities_h_
 #define __XBUtilities_h_
@@ -18,6 +18,7 @@
 #include <map>
 #include <memory>
 #include <string>
+#include <tuple>
 #include <vector>
 
 #include <boost/algorithm/string.hpp>
@@ -156,7 +157,23 @@ namespace XBUtilities {
 
   bool
   is_strix_hardware(xrt_core::smi::smi_hardware_config::hardware_type hw_type);
-                                 /**
+
+  void
+  printAdvancedDisclaimer();
+
+  /**
+   * isUsingAdvanced() - Check if user is using xrt-smi advanced/hidden features
+   *
+   * @configItems: Vector of tuples (name, description, type) from shim config
+   * @requestedNames: Vector of names requested by the user
+   * Return: true if advanced mode is enabled and user is using advanced/hidden features
+   */
+  bool
+  isUsingAdvanced(
+      const std::vector<std::tuple<std::string, std::string, std::string>>& configItems,
+      const std::vector<std::string>& requestedNames);
+
+  /**
    * Open archive from device
    */
   std::unique_ptr<xrt_core::archive> 

src/runtime_src/core/tools/xbutil2/EventTracing/OO_EventTrace.cpp

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (C) 2025-2026 Advanced Micro Devices, Inc. All rights reserved.
 
 // ------ I N C L U D E   F I L E S -------------------------------------------
 // Local - Include Files
@@ -133,6 +133,8 @@ void
 OO_EventTrace::
 execute(const SubCmdOptions& _options) const
 {
+  XBUtilities::printAdvancedDisclaimer();
+
   XBUtilities::verbose("SubCommand option: Event Trace");
   XBUtilities::sudo_or_throw("Event tracing requires admin privileges");
 

src/runtime_src/core/tools/xbutil2/FirmwareLogging/OO_FirmwareLog.cpp

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (C) 2025-2026 Advanced Micro Devices, Inc. All rights reserved.
 
 // ------ I N C L U D E   F I L E S -------------------------------------------
 // Local - Include Files
@@ -49,6 +49,8 @@ OO_FirmwareLog::validate_args() const {
 void
 OO_FirmwareLog::execute(const SubCmdOptions& _options) const
 {
+  XBUtilities::printAdvancedDisclaimer();
+
   XBUtilities::verbose("SubCommand option: Firmware Log");
   XBUtilities::sudo_or_throw("Firmware logging requires admin privileges");
 

src/runtime_src/core/tools/xbutil2/OO_Preemption.cpp

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright (C) 2024-2025 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (C) 2024-2026 Advanced Micro Devices, Inc. All rights reserved.
 
 // ------ I N C L U D E   F I L E S -------------------------------------------
 // Local - Include Files
@@ -51,6 +51,8 @@ OO_Preemption::validate_args() const {
 void
 OO_Preemption::execute(const SubCmdOptions& _options) const
 {
+  XBUtilities::printAdvancedDisclaimer();
+
   XBUtilities::verbose("SubCommand option: Pre-emption");
 
   XBUtilities::verbose("Option(s):");

src/runtime_src/core/tools/xbutil2/SubCmdExamine.cpp

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2020-2022 Xilinx, Inc
-// Copyright (C) 2022-2025 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (C) 2022-2026 Advanced Micro Devices, Inc. All rights reserved.
 
 // ------ I N C L U D E   F I L E S -------------------------------------------
 // Local - Include Files
@@ -288,6 +288,9 @@ SubCmdExamine::execute(const SubCmdOptions& _options) const
   if (device){
     const xrt_core::smi::tuple_vector& reportList = xrt_core::device_query<xrt_core::query::xrt_smi_lists>(device, xrt_core::query::xrt_smi_lists::type::examine_reports);
     runnableReports = getReportsList(reportList);
+
+    if (XBU::isUsingAdvanced(reportList, reportsToRun))
+      XBU::printAdvancedDisclaimer();
   } 
   else {
     runnableReports = uniqueReportCollection;

src/runtime_src/core/tools/xbutil2/SubCmdValidate.cpp

@@ -531,6 +531,9 @@ SubCmdValidate::execute(const SubCmdOptions& _options) const
     // All Error Handling for xrt-smi validate should go here
     handle_errors_and_validate_tests(vm, options, testOptions, validatedTests, param); 
 
+    if (XBU::isUsingAdvanced(tests, validatedTests))
+      XBU::printAdvancedDisclaimer();
+
     // check if xclbin folder path is provided
     if (!validateXclbinPath.empty()) {
       XBU::verbose("Sub command: --path");