@@ -1991,6 +1991,7 @@ void PCM::initUncorePMUsDirect()
19911991 if (IVYTOWN == cpu_model || JAKETOWN == cpu_model)
19921992 {
19931993 uncorePMUs[s].resize (1 );
1994+ {
19941995 std::vector<std::shared_ptr<HWRegister> > CounterControlRegs{
19951996 std::make_shared<MSRRegister>(handle, JKTIVT_UBOX_MSR_PMON_CTL0_ADDR),
19961997 std::make_shared<MSRRegister>(handle, JKTIVT_UBOX_MSR_PMON_CTL1_ADDR)
@@ -2008,10 +2009,12 @@ void PCM::initUncorePMUsDirect()
20082009 std::make_shared<MSRRegister>(handle, JKTIVT_UCLK_FIXED_CTR_ADDR)
20092010 )
20102011 );
2012+ }
20112013 }
20122014 else if (SPR == cpu_model)
20132015 {
20142016 uncorePMUs[s].resize (1 );
2017+ {
20152018 std::vector<std::shared_ptr<HWRegister> > CounterControlRegs{
20162019 std::make_shared<MSRRegister>(handle, SPR_UBOX_MSR_PMON_CTL0_ADDR),
20172020 std::make_shared<MSRRegister>(handle, SPR_UBOX_MSR_PMON_CTL1_ADDR)
@@ -2029,10 +2032,12 @@ void PCM::initUncorePMUsDirect()
20292032 std::make_shared<MSRRegister>(handle, SPR_UCLK_FIXED_CTR_ADDR)
20302033 )
20312034 );
2035+ }
20322036 }
20332037 else if (isServerCPU () && hasPCICFGUncore ())
20342038 {
20352039 uncorePMUs[s].resize (1 );
2040+ {
20362041 std::vector<std::shared_ptr<HWRegister> > CounterControlRegs{
20372042 std::make_shared<MSRRegister>(handle, UBOX_MSR_PMON_CTL0_ADDR),
20382043 std::make_shared<MSRRegister>(handle, UBOX_MSR_PMON_CTL1_ADDR),
@@ -2050,6 +2055,7 @@ void PCM::initUncorePMUsDirect()
20502055 std::make_shared<MSRRegister>(handle, UCLK_FIXED_CTR_ADDR)
20512056 )
20522057 );
2058+ }
20532059 }
20542060
20552061 auto addPMUsFromDiscoveryRef = [this , &handle, &s](std::vector<UncorePMURef>& out, const unsigned int pmuType, const int filter0 = -1 )
0 commit comments