From 70101efc007ddb536df4e5013621799da0704393 Mon Sep 17 00:00:00 2001
From: lijing-mt <jing.li@mthreads.com>
Date: Mon, 17 Aug 2026 12:04:07 +0800
Subject: [PATCH] Update sync torch_musa 2.11.0.post1

---
 libkineto/include/ActivityType.h | 1 +
 libkineto/src/ActivityType.cpp   | 1 +
 libkineto/src/Config.cpp         | 8 ++++++--
 libkineto/src/Logger.cpp         | 4 +++-
 libkineto/src/output_csv.cpp     | 4 +++-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/libkineto/include/ActivityType.h b/libkineto/include/ActivityType.h
index b4124a2..228cfe6 100644
--- a/libkineto/include/ActivityType.h
+++ b/libkineto/include/ActivityType.h
@@ -40,6 +40,7 @@ enum class ActivityType {
     CUDA_PROFILER_RANGE, // MUPTI Profiler range for performance metrics
     HPU_OP, // HPU host side runtime event
     XPU_RUNTIME, // host side xpu runtime events
+    XPU_DRIVER, // host side xpu driver events
     COLLECTIVE_COMM, // collective communication
     MTIA_WORKLOADD, // MTIA workloadd events
 
diff --git a/libkineto/src/ActivityType.cpp b/libkineto/src/ActivityType.cpp
index 20c6f04..7500650 100644
--- a/libkineto/src/ActivityType.cpp
+++ b/libkineto/src/ActivityType.cpp
@@ -38,6 +38,7 @@ static constexpr std::array<ActivityTypeName, activityTypeCount + 1> map{{
     {"musa_profiler_range", ActivityType::CUDA_PROFILER_RANGE},
     {"hpu_op", ActivityType::HPU_OP},
     {"xpu_runtime", ActivityType::XPU_RUNTIME},
+    {"xpu_driver", ActivityType::XPU_DRIVER},
     {"collective_comm", ActivityType::COLLECTIVE_COMM},
     {"mtia_workloadd", ActivityType::MTIA_WORKLOADD},
     {"privateuse1_runtime", ActivityType::PRIVATEUSE1_RUNTIME},
diff --git a/libkineto/src/Config.cpp b/libkineto/src/Config.cpp
index c6559aa..dc591f3 100644
--- a/libkineto/src/Config.cpp
+++ b/libkineto/src/Config.cpp
@@ -277,7 +277,9 @@ const seconds Config::maxRequestAge() const {
 
 static std::string getTimeStr(time_point<system_clock> t) {
   std::time_t t_c = system_clock::to_time_t(t);
-  return fmt::format("{:%H:%M:%S}", fmt::localtime(t_c));
+  std::tm tm;
+  localtime_r(&t_c, &tm);
+  return fmt::format("{:%H:%M:%S}", tm);
 }
 
 static time_point<system_clock> handleRequestTimestamp(int64_t ms) {
@@ -554,8 +556,10 @@ void Config::printActivityProfilerConfig(std::ostream& s) const {
     }
   } else if (hasProfileStartTime()) {
     std::time_t t_c = system_clock::to_time_t(requestTimestamp());
+    std::tm tm;
+    localtime_r(&t_c, &tm);
     s << "  Trace start time: "
-              << fmt::format("{:%Y-%m-%d %H:%M:%S}", fmt::localtime(t_c));
+      << fmt::format("{:%Y-%m-%d %H:%M:%S}", tm);
     s << "  Trace duration: " << activitiesDuration().count() << "ms"
       << std::endl;
     s << "  Warmup duration: " << activitiesWarmupDuration().count() << "s"
diff --git a/libkineto/src/Logger.cpp b/libkineto/src/Logger.cpp
index 7c5858f..e14dcc0 100644
--- a/libkineto/src/Logger.cpp
+++ b/libkineto/src/Logger.cpp
@@ -39,8 +39,10 @@ Logger::Logger(int severity, int line, const char* filePath, int errnum)
 
   const auto tt =
       std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+  std::tm tm;
+  localtime_r(&tt, &tm);
   const char* file = strrchr(filePath, '/');
-  buf_ << fmt::format("{:%Y-%m-%d %H:%M:%S}", fmt::localtime(tt)) << " "
+  buf_ << fmt::format("{:%Y-%m-%d %H:%M:%S}", tm) << " "
        << processId(false) << ":" << systemThreadId(false) << " "
        << (file ? file + 1 : filePath) << ":" << line << "] ";
 }
diff --git a/libkineto/src/output_csv.cpp b/libkineto/src/output_csv.cpp
index a0d9e2c..e6a316f 100644
--- a/libkineto/src/output_csv.cpp
+++ b/libkineto/src/output_csv.cpp
@@ -47,11 +47,13 @@ void EventCSVLogger::handleSample(int device, const Sample& sample, bool from_ne
   if (out_) {
     auto now = system_clock::now();
     auto time = system_clock::to_time_t(now);
+    std::tm tm;
+    localtime_r(&time, &tm);
     for (const Stat& s : sample.stats) {
       if (eventNames_.find(s.name) == eventNames_.end()) {
         continue;
       }
-      *out_ << fmt::format("{:%Y-%m-%d %H:%M:%S}", fmt::localtime(time)) << ",";
+      *out_ << fmt::format("{:%Y-%m-%d %H:%M:%S}", tm) << ",";
       *out_ << sample.deltaMsec << ",";
       *out_ << device << ",";
       *out_ << s.name;