Revert "Support for RSMI_EVNT_GRP_XGMI_DATA_OUT counters"

This reverts commit 946bf93dfb.

Temporarily reverting until the driver side of this is upstream

Change-Id: I2d8243208c1271ebad90bc2ee0fda2dfefb0831b

src/rocm_smi.cc

@@ -828,6 +828,7 @@ rsmi_dev_perf_level_set(int32_t dv_ind, rsmi_dev_perf_level_t perf_level) {
 
 static rsmi_status_t
 set_dev_range(uint32_t dv_ind, std::string range) {
+
   GET_DEV_FROM_INDX
 
   int ret = dev->writeDevInfo(amd::smi::kDevPowerODVoltage, range);
@@ -1060,9 +1061,9 @@ rsmi_status_t rsmi_dev_od_clk_info_set(uint32_t dv_ind, rsmi_freq_ind_t level,
   }
 
   // For clock frequency setting, enter a new value by writing a string that
-  // contains "s/m index clock" to the file. The index should be 0 if to set
-  // minimum clock. And 1 if to set maximum clock. E.g., "s 0 500" will update
-  // minimum sclk to be 500 MHz. "m 1 800" will update maximum mclk to 800Mhz.
+  // contains “s/m index clock” to the file. The index should be 0 if to set
+  // minimum clock. And 1 if to set maximum clock. E.g., “s 0 500” will update
+  // minimum sclk to be 500 MHz. “m 1 800” will update maximum mclk to 800Mhz.
 
   switch (clkType) {
     case RSMI_CLK_TYPE_SYS:
@@ -1085,7 +1086,7 @@ rsmi_status_t rsmi_dev_od_clk_info_set(uint32_t dv_ind, rsmi_freq_ind_t level,
   ret = set_dev_range(dv_ind, sysvalue);
   if (ret != RSMI_STATUS_SUCCESS) {
     return ret;
-  }
+   }
   ret = set_dev_range(dv_ind, "c");
   if (ret != RSMI_STATUS_SUCCESS) {
     return ret;
@@ -1108,9 +1109,9 @@ rsmi_status_t rsmi_dev_od_volt_info_set(uint32_t dv_ind, uint32_t vpoint,
   }
 
   // For sclk voltage curve, enter the new values by writing a string that
-  // contains "vc point clock voltage" to the file. The points are indexed
-  // by 0, 1 and 2. E.g., "vc 0 300 600" will update point1 with clock set
-  // as 300Mhz and voltage as 600mV. "vc 2 1000 1000" will update point3
+  // contains “vc point clock voltage” to the file. The points are indexed
+  // by 0, 1 and 2. E.g., “vc 0 300 600” will update point1 with clock set
+  // as 300Mhz and voltage as 600mV. “vc 2 1000 1000” will update point3
   // with clock set as 1000Mhz and voltage 1000mV.
 
   std::string sysvalue = "vc";
@@ -2854,8 +2855,6 @@ rsmi_counter_available_counters_get(uint32_t dv_ind,
 
   switch (grp) {
     case RSMI_EVNT_GRP_XGMI:
-    case RSMI_EVNT_GRP_XGMI_DATA_OUT:
-
       ret = get_dev_value_int(amd::smi::kDevDFCountersAvailable, dv_ind, &val);
       assert(val < UINT32_MAX);
       *available = static_cast<uint32_t>(val);

src/rocm_smi_counters.cc

@@ -72,7 +72,6 @@ static const char *kPathDeviceEventRoot = "/sys/bus/event_source/devices";
 
 // Event group names
 static const char *kEvGrpDataFabricFName = "amdgpu_df_#";
-static const char *kEvGrpAmdGpuFName = "amdgpu_#";
 
 // Data Fabric event file names
 static const char *kDFEvtCake0FtiReqAllocFName = "cake0_ftiinstat_reqalloc";
@@ -84,14 +83,6 @@ static const char *kDFEvtCake1FtiRspAllocFName = "cake1_ftiinstat_rspalloc";
 static const char *kDFEvtCake1PcsOutTxDataFName = "cake1_pcsout_txdata";
 static const char *kDFEvtCake1PcsOutTxMetaFName = "cake1_pcsout_txmeta";
 
-// XGMI Data Outbound event file names
-static const char *kXGMIDOutBound0FName = "xgmi_link0_data_outbound";
-static const char *kXGMIDOutBound1FName = "xgmi_link1_data_outbound";
-static const char *kXGMIDOutBound2FName = "xgmi_link2_data_outbound";
-static const char *kXGMIDOutBound3FName = "xgmi_link3_data_outbound";
-static const char *kXGMIDOutBound4FName = "xgmi_link4_data_outbound";
-static const char *kXGMIDOutBound5FName = "xgmi_link5_data_outbound";
-
 
 static const std::map<rsmi_event_type_t, const char *> kEventFNameMap = {
   {RSMI_EVNT_XGMI_0_NOP_TX,      kDFEvtCake0PcsOutTxMetaFName},
@@ -102,18 +93,10 @@ static const std::map<rsmi_event_type_t, const char *> kEventFNameMap = {
   {RSMI_EVNT_XGMI_1_REQUEST_TX,  kDFEvtCake1FtiReqAllocFName},
   {RSMI_EVNT_XGMI_1_RESPONSE_TX, kDFEvtCake1FtiRspAllocFName},
   {RSMI_EVNT_XGMI_1_BEATS_TX,    kDFEvtCake1PcsOutTxDataFName},
-
-  {RSMI_EVNT_XGMI_DATA_OUT_0,    kXGMIDOutBound0FName},
-  {RSMI_EVNT_XGMI_DATA_OUT_1,    kXGMIDOutBound1FName},
-  {RSMI_EVNT_XGMI_DATA_OUT_2,    kXGMIDOutBound2FName},
-  {RSMI_EVNT_XGMI_DATA_OUT_3,    kXGMIDOutBound3FName},
-  {RSMI_EVNT_XGMI_DATA_OUT_4,    kXGMIDOutBound4FName},
-  {RSMI_EVNT_XGMI_DATA_OUT_5,    kXGMIDOutBound5FName},
 };
 
 static const std::map<rsmi_event_group_t, const char *> kEvtGrpFNameMap = {
-    {RSMI_EVNT_GRP_XGMI,          kEvGrpDataFabricFName},
-    {RSMI_EVNT_GRP_XGMI_DATA_OUT, kEvGrpAmdGpuFName},
+    {RSMI_EVNT_GRP_XGMI, kEvGrpDataFabricFName},
     {RSMI_EVNT_GRP_INVALID, "bogus"},
 };
 
@@ -124,7 +107,6 @@ static rsmi_event_group_t EvtGrpFromEvtID(rsmi_event_type_t evnt) {
     return EVGRP_ENUM; \
   }
   EVNT_GRP_RANGE_CHK(XGMI, RSMI_EVNT_GRP_XGMI);
-  EVNT_GRP_RANGE_CHK(XGMI_DATA_OUT, RSMI_EVNT_GRP_XGMI_DATA_OUT);
 
   return RSMI_EVNT_GRP_INVALID;
 }

src/rocm_smi_device.cc

@@ -646,7 +646,7 @@ int Device::readDevInfoBinary(DevInfoTypes type,
   }
   // copies all data into buffer
   retVec->insert(retVec->begin(),
-               std::istreambuf_iterator<char>(fs), {});
+               std::istreambuf_iterator<char>(fs),{});
 
   return 0;
 }