Add support for rsmi_dev_memory_reserved_pages_get()

Also, don't return an error for empty sysfs files. The reserved memory page file will often have no lines. We don't want it to appear that this function is not supported if the file is empty. Change-Id: I1d28bb184ea587bb578fe71dd75adc2a812d09a8 [ROCm/rocm_smi_lib commit: 73c54e1fd0]
2019-08-06 11:05:23 -05:00
parent 32645f25a6
commit d0e645fbf2
7 changed files with 363 additions and 1 deletions
@@ -0,0 +1,157 @@
+/*
+ * =============================================================================
+ * The University of Illinois/NCSA
+ * Open Source License (NCSA)
+ *
+ * Copyright (c) 2019, Advanced Micro Devices, Inc.
+ * All rights reserved.
+ *
+ * Developed by:
+ *
+ *                 AMD Research and AMD ROC Software Development
+ *
+ *                 Advanced Micro Devices, Inc.
+ *
+ *                 www.amd.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal with the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ *  - Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimers.
+ *  - Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimers in
+ *    the documentation and/or other materials provided with the distribution.
+ *  - Neither the names of <Name of Development Group, Name of Institution>,
+ *    nor the names of its contributors may be used to endorse or promote
+ *    products derived from this Software without specific prior written
+ *    permission.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS WITH THE SOFTWARE.
+ *
+ */
+
+#include <stdint.h>
+#include <stddef.h>
+
+#include <iostream>
+#include <string>
+
+#include "gtest/gtest.h"
+#include "rocm_smi/rocm_smi.h"
+#include "rocm_smi_test/functional/mem_page_info_read.h"
+#include "rocm_smi_test/test_common.h"
+
+TestMemPageInfoRead::TestMemPageInfoRead() : TestBase() {
+  set_title("RSMI Memory Page Info Test");
+  set_description("The Memory Page Info. test verifies that we can read "
+      "memory page information, and then displays the information read");
+}
+
+TestMemPageInfoRead::~TestMemPageInfoRead(void) {
+}
+
+void TestMemPageInfoRead::SetUp(void) {
+  TestBase::SetUp();
+
+  return;
+}
+
+void TestMemPageInfoRead::DisplayTestInfo(void) {
+  TestBase::DisplayTestInfo();
+}
+
+void TestMemPageInfoRead::DisplayResults(void) const {
+  TestBase::DisplayResults();
+  return;
+}
+
+void TestMemPageInfoRead::Close() {
+  // This will close handles opened within rsmitst utility calls and call
+  // rsmi_shut_down(), so it should be done after other hsa cleanup
+  TestBase::Close();
+}
+
+void TestMemPageInfoRead::Run(void) {
+  rsmi_status_t err;
+  rsmi_retired_page_record_t *records;
+  uint32_t num_pages;
+
+  TestBase::Run();
+
+  for (uint32_t i = 0; i < num_monitor_devs(); ++i) {
+    PrintDeviceHeader(i);
+
+    err = rsmi_dev_memory_reserved_pages_get(i, &num_pages, nullptr);
+
+    if (err == RSMI_STATUS_NOT_SUPPORTED) {
+      std::cout <<
+          "\t**Memory page information is not supported for this device"
+                                                                 << std::endl;
+      continue;
+    } else {
+      CHK_ERR_ASRT(err)
+      IF_VERB(STANDARD) {
+        std::cout << "\tNumber of memory page records: " << num_pages <<
+                                                                    std::endl;
+      }
+    }
+
+    if (num_pages > 0) {
+      records = new rsmi_retired_page_record_t[num_pages];
+
+      assert(records != nullptr);
+
+      err = rsmi_dev_memory_reserved_pages_get(i, &num_pages, records);
+      if (err == RSMI_STATUS_NOT_SUPPORTED) {
+        std::cout << "\t**Getting Memory Page Retirement Status not "
+                                     "supported for this device" << std::endl;
+        continue;
+      } else {
+          CHK_ERR_ASRT(err)
+      }
+
+      IF_VERB(STANDARD) {
+        std::cout.setf(std::ios::hex, std::ios::basefield);
+        std::string page_state;
+
+        for (uint32_t p = 0; p < num_pages; ++p) {
+          std::cout << "\t\tAddress: 0x" << records[p].page_address;
+          std::cout << "  Size: " << records[p].page_size;
+
+          switch (records[p].status) {
+            case RSMI_MEM_PAGE_STATUS_RESERVED:
+              page_state = "Retired";
+              break;
+
+            case RSMI_MEM_PAGE_STATUS_PENDING:
+              page_state = "Pending";
+              break;
+
+            case RSMI_MEM_PAGE_STATUS_UNRESERVABLE:
+              page_state = "Unreservable";
+              break;
+
+            default:
+              ASSERT_EQ(0, 1) << "Unexpected memory page status";
+          }
+          std::cout << "  Status: " << page_state << std::endl;
+        }
+        std::cout.setf(std::ios::dec, std::ios::basefield);
+      }
+      delete []records;
+    } else {
+      continue;
+    }
+  }
+}
@@ -0,0 +1,71 @@
+/*
+ * =============================================================================
+ * The University of Illinois/NCSA
+ * Open Source License (NCSA)
+ *
+ * Copyright (c) 2019, Advanced Micro Devices, Inc.
+ * All rights reserved.
+ *
+ * Developed by:
+ *
+ *                 AMD Research and AMD ROC Software Development
+ *
+ *                 Advanced Micro Devices, Inc.
+ *
+ *                 www.amd.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal with the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ *  - Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimers.
+ *  - Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimers in
+ *    the documentation and/or other materials provided with the distribution.
+ *  - Neither the names of <Name of Development Group, Name of Institution>,
+ *    nor the names of its contributors may be used to endorse or promote
+ *    products derived from this Software without specific prior written
+ *    permission.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS WITH THE SOFTWARE.
+ *
+ */
+#ifndef TESTS_ROCM_SMI_TEST_FUNCTIONAL_MEM_PAGE_INFO_READ_H_
+#define TESTS_ROCM_SMI_TEST_FUNCTIONAL_MEM_PAGE_INFO_READ_H_
+
+#include "rocm_smi_test/test_base.h"
+
+class TestMemPageInfoRead : public TestBase {
+ public:
+    TestMemPageInfoRead();
+
+  // @Brief: Destructor for test case of TestMemPageInfoRead
+  virtual ~TestMemPageInfoRead();
+
+  // @Brief: Setup the environment for measurement
+  virtual void SetUp();
+
+  // @Brief: Core measurement execution
+  virtual void Run();
+
+  // @Brief: Clean up and retrive the resource
+  virtual void Close();
+
+  // @Brief: Display  results
+  virtual void DisplayResults() const;
+
+  // @Brief: Display information about what this test does
+  virtual void DisplayTestInfo(void);
+};
+
+#endif  // TESTS_ROCM_SMI_TEST_FUNCTIONAL_MEM_PAGE_INFO_READ_H_
@@ -75,6 +75,7 @@
 #include "functional/perf_cntr_read_write.h"
 #include "functional/process_info_read.h"
 #include "functional/xgmi_read_write.h"
+#include "functional/mem_page_info_read.h"

 static RSMITstGlobals *sRSMIGlvalues = nullptr;

@@ -213,6 +214,10 @@ TEST(rsmitstReadWrite, TestXGMIReadWrite) {
  TestXGMIReadWrite tst;
  RunGenericTest(&tst);
 }
+TEST(rsmitstReadOnly, TestMemPageInfoRead) {
+  TestMemPageInfoRead tst;
+  RunGenericTest(&tst);
+}

 int main(int argc, char** argv) {
  ::testing::InitGoogleTest(&argc, argv);