@@ -2051,36 +2051,6 @@ void PCM::initUncorePMUsDirect()
20512051 );
20522052 }
20532053
2054- auto addPMUsFromDiscovery = [this , &handle, &s](std::vector<UncorePMU> & out, const unsigned int pmuType, const int filter0 = -1 )
2055- {
2056- if (uncorePMUDiscovery.get ())
2057- {
2058- for (size_t box = 0 ; box < uncorePMUDiscovery->getNumBoxes (pmuType, s); ++box)
2059- {
2060- if (uncorePMUDiscovery->getBoxAccessType (pmuType, s, box) == UncorePMUDiscovery::accessTypeEnum::MSR
2061- && uncorePMUDiscovery->getBoxNumRegs (pmuType, s, box) >= 4 )
2062- {
2063- out.push_back (
2064- UncorePMU (
2065- std::make_shared<MSRRegister>(handle, uncorePMUDiscovery->getBoxCtlAddr (pmuType, s, box)),
2066- std::make_shared<MSRRegister>(handle, uncorePMUDiscovery->getBoxCtlAddr (pmuType, s, box, 0 )),
2067- std::make_shared<MSRRegister>(handle, uncorePMUDiscovery->getBoxCtlAddr (pmuType, s, box, 1 )),
2068- std::make_shared<MSRRegister>(handle, uncorePMUDiscovery->getBoxCtlAddr (pmuType, s, box, 2 )),
2069- std::make_shared<MSRRegister>(handle, uncorePMUDiscovery->getBoxCtlAddr (pmuType, s, box, 3 )),
2070- std::make_shared<MSRRegister>(handle, uncorePMUDiscovery->getBoxCtrAddr (pmuType, s, box, 0 )),
2071- std::make_shared<MSRRegister>(handle, uncorePMUDiscovery->getBoxCtrAddr (pmuType, s, box, 1 )),
2072- std::make_shared<MSRRegister>(handle, uncorePMUDiscovery->getBoxCtrAddr (pmuType, s, box, 2 )),
2073- std::make_shared<MSRRegister>(handle, uncorePMUDiscovery->getBoxCtrAddr (pmuType, s, box, 3 )),
2074- std::shared_ptr<MSRRegister>(),
2075- std::shared_ptr<MSRRegister>(),
2076- (filter0 < 0 ) ? std::shared_ptr<MSRRegister>() : std::make_shared<MSRRegister>(handle, uncorePMUDiscovery->getBoxCtlAddr (pmuType, s, box) + filter0) // filters not supported by discovery
2077- )
2078- );
2079- }
2080- }
2081- }
2082- };
2083-
20842054 auto addPMUsFromDiscoveryRef = [this , &handle, &s](std::vector<UncorePMURef>& out, const unsigned int pmuType, const int filter0 = -1 )
20852055 {
20862056 if (uncorePMUDiscovery.get ())
0 commit comments