made adjustments as per Chinmay's recommendations

Author: theSK2005

amd/comgr/src/comgr-env.cpp

@@ -60,17 +60,12 @@ bool needTimeStatistics() {
 }
 
 uint32_t getGranularityUnitsPerSecond() {
-  static const char *TimeStatisticsGranularity =
-      getenv("AMD_COMGR_TIME_STATISTICS_GRANULARITY");
-  if (!TimeStatisticsGranularity)
-    return 1e3;
-  StringRef G(TimeStatisticsGranularity);
+  StringRef G = getTimeStatisticsGranularity();
   if (G == "us")
     return 1e6;
   else if (G == "ns")
     return 1e9;
-  else
-    return 1e3;
+  return 1e3;
 }
 
 llvm::StringRef getTimeStatisticsGranularity() {

amd/comgr/src/comgr-env.h

@@ -29,10 +29,10 @@ bool shouldEmitVerboseLogs();
 /// Return whether the environment requests time statistics collection.
 bool needTimeStatistics();
 
-// Return granularity (ms, us, ns) units per second
+/// Return granularity (ms, us, ns) units per second
 uint32_t getGranularityUnitsPerSecond();
 
-// Return granularity of time statistics (ms, us, ns)
+/// Return granularity of time statistics (ms, us, ns)
 llvm::StringRef getTimeStatisticsGranularity();
 
 /// If environment variable LLVM_PATH is set, return the environment variable,

amd/comgr/src/time-stat/perf-timer.h

@@ -17,6 +17,7 @@ class PerfTimerImpl {
 protected:
   long long CounterStart;
   double PCFreq;
+  uint32_t GranularityPerSecond;
 
 public:
   PerfTimerImpl() : CounterStart(0), PCFreq(0.0) {};

amd/comgr/src/time-stat/time-stat.cpp

@@ -104,7 +104,7 @@ ProfilePoint::~ProfilePoint() {
 class PerfTimerWindows : public PerfTimerImpl {
 
 public:
-  PerfTimerWindows(){};
+  PerfTimerWindows() {};
   virtual bool Init() override {
     LARGE_INTEGER li;
     if (QueryPerformanceCounter(&li))
@@ -120,7 +120,7 @@ class PerfTimerWindows : public PerfTimerImpl {
     }
     // QueryPerformanceFrequency returns counts per second
     // If we need milliseconds we divide by 10^3
-    uint32_t GranularityPerSecond = env::getGranularityUnitsPerSecond();
+    GranularityPerSecond = env::getGranularityUnitsPerSecond();
     PCFreq = li.QuadPart / GranularityPerSecond;
     return true;
   }
@@ -155,7 +155,7 @@ class PerfTimerPosix : public PerfTimerImpl {
     }
     // clock_getres returns counts per nanosecond
     // If we need milliseconds we multiply by 10^6
-    uint32_t GranularityPerSecond = env::getGranularityUnitsPerSecond();
+    GranularityPerSecond = env::getGranularityUnitsPerSecond();
     PCFreq = (Res.tv_sec * 1e9 + Res.tv_nsec) * (1e9 / GranularityPerSecond);
     return true;
   }