Remove duplicated function GetDeviceCapFromXPlane

PiperOrigin-RevId: 399529225
Change-Id: I43674969ec0a25e1f01f6ba42da06c654718dc5b

Author: jbaiocchi

tensorflow/core/profiler/convert/BUILD

@@ -338,6 +338,7 @@ cc_library(
         "//tensorflow/core/profiler/protobuf:steps_db_proto_cc",
         "//tensorflow/core/profiler/protobuf:tf_function_proto_cc",
         "//tensorflow/core/profiler/protobuf:xplane_proto_cc",
+        "//tensorflow/core/profiler/utils:device_caps_utils",
         "//tensorflow/core/profiler/utils:event_span",
         "//tensorflow/core/profiler/utils:hardware_type_utils",
         "//tensorflow/core/profiler/utils:kernel_stats_utils",

tensorflow/core/profiler/convert/xplane_to_op_stats.cc

@@ -36,6 +36,7 @@ limitations under the License.
 #include "tensorflow/core/profiler/protobuf/steps_db.pb.h"
 #include "tensorflow/core/profiler/protobuf/tf_function.pb.h"
 #include "tensorflow/core/profiler/protobuf/xplane.pb.h"
+#include "tensorflow/core/profiler/utils/device_caps_utils.h"
 #include "tensorflow/core/profiler/utils/event_span.h"
 #include "tensorflow/core/profiler/utils/hardware_type_utils.h"
 #include "tensorflow/core/profiler/utils/kernel_stats_utils.h"
@@ -49,38 +50,6 @@ limitations under the License.
 namespace tensorflow {
 namespace profiler {
 
-DeviceCapabilities GetDeviceCapFromXPlane(const XPlane& device_plane) {
-  DeviceCapabilities cap;
-  XPlaneVisitor plane = CreateTfXPlaneVisitor(&device_plane);
-  plane.ForEachStat([&cap](const XStatVisitor& stat) {
-    if (!stat.Type().has_value()) return;
-    switch (stat.Type().value()) {
-      case kDevCapClockRateKHz:
-        cap.set_clock_rate_in_ghz(stat.IntValue() / 1000000.0);
-        break;
-      case kDevCapCoreCount:
-        cap.set_num_cores(stat.IntValue());
-        break;
-      case kDevCapMemoryBandwidth:
-        cap.set_memory_bandwidth(stat.UintValue());  // bytes/s
-        break;
-      case kDevCapMemorySize:
-        cap.set_memory_size_in_bytes(stat.UintValue());
-        break;
-      case kDevCapComputeCapMajor:
-        cap.mutable_compute_capability()->set_major(stat.IntValue());
-        break;
-      case kDevCapComputeCapMinor:
-        cap.mutable_compute_capability()->set_minor(stat.IntValue());
-        break;
-      case kDevVendor:
-        cap.set_device_vendor(std::string(stat.StrOrRefValue()));
-        break;
-    }
-  });
-  return cap;
-}
-
 PerfEnv MakePerfEnv(double peak_tera_flops_per_second,
                     double peak_hbm_bw_giga_bytes_per_second) {
   PerfEnv result;
@@ -93,7 +62,7 @@ PerfEnv MakePerfEnv(double peak_tera_flops_per_second,
 }
 
 PerfEnv GetPerfEnvFromXPlane(const XPlane& device_plane) {
-  DeviceCapabilities cap = GetDeviceCapFromXPlane(device_plane);
+  DeviceCapabilities cap = GetDeviceCaps(device_plane);
   return MakePerfEnv(GetFlopMaxThroughputPerSM(cap) / 1000 * cap.num_cores(),
                      cap.memory_bandwidth() / 1e9);
 }
@@ -159,7 +128,7 @@ OpStats ConvertXSpaceToOpStats(const XSpace& space,
       op_metrics_db_combiner.Combine(device_op_metrics_db);
     }
     if (gpu_model.empty()) {
-      gpu_model = GpuModelName(GetDeviceCapFromXPlane(*device_trace));
+      gpu_model = GpuModelName(GetDeviceCaps(*device_trace));
     }
     if (options.generate_step_db) {
       StepEvents device_step_events =

tensorflow/core/profiler/convert/xplane_to_op_stats.h

@@ -40,9 +40,6 @@ OpStats ConvertXSpaceToOpStats(const XSpace& space,
 void PropagateXSpaceDiagnosticsToOpStats(const XSpace& space,
                                          OpStats* op_stats);
 
-// Extracts DeviceCapabilities from XPlane stats.
-DeviceCapabilities GetDeviceCapFromXPlane(const XPlane& device_plane);
-
 // Populates PerfEnv.
 PerfEnv MakePerfEnv(double peak_tera_flops_per_second,
                     double peak_hbm_bw_giga_bytes_per_second);

tensorflow/core/profiler/utils/device_caps_utils.cc

@@ -59,7 +59,7 @@ DeviceCapabilities GetDeviceCaps(const XPlane& plane) {
     if (!stat.Type().has_value()) return;
     switch (stat.Type().value()) {
       case StatType::kDevCapClockRateKHz:
-        caps.set_clock_rate_in_ghz(stat.IntOrUintValue() * 1000000.0);
+        caps.set_clock_rate_in_ghz(stat.IntOrUintValue() / 1000000.0);
         break;
       case StatType::kDevCapCoreCount:
         caps.set_num_cores(stat.IntOrUintValue());