Merge pull request #192 from intel-innersource/rdementi/perf-uncore-fixes

rdementi · web-flow · commit 4a7e27e30161 · 2022-03-24T15:17:25.000+01:00
don't call init reg location and bus when perf uncore driver used
diff --git a/src/cpucounters.cpp b/src/cpucounters.cpp
@@ -5754,15 +5754,14 @@ ServerPCICFGUncore::ServerPCICFGUncore(uint32 socket_, const PCM * pcm) :
    , cpu_model(pcm->getCPUModel())
    , qpi_speed(0)
 {
-    initRegisterLocations(pcm);
-    initBuses(socket_, pcm);
-
     if (pcm->useLinuxPerfForUncore())
     {
         initPerf(socket_, pcm);
     }
     else
     {
+        initRegisterLocations(pcm);
+        initBuses(socket_, pcm);
         initDirect(socket_, pcm);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -5754,15 +5754,14 @@ ServerPCICFGUncore::ServerPCICFGUncore(uint32 socket_, const PCM * pcm) :`
`5754`	`5754`	`, cpu_model(pcm->getCPUModel())`
`5755`	`5755`	`, qpi_speed(0)`
`5756`	`5756`	`{`
`5757`		`- initRegisterLocations(pcm);`
`5758`		`- initBuses(socket_, pcm);`
`5759`		`-`
`5760`	`5757`	`if (pcm->useLinuxPerfForUncore())`
`5761`	`5758`	`{`
`5762`	`5759`	`initPerf(socket_, pcm);`
`5763`	`5760`	`}`
`5764`	`5761`	`else`
`5765`	`5762`	`{`
	`5763`	`+ initRegisterLocations(pcm);`
	`5764`	`+ initBuses(socket_, pcm);`
`5766`	`5765`	`initDirect(socket_, pcm);`
`5767`	`5766`	`}`
`5768`	`5767`