diff --git a/src/cpucounters.cpp b/src/cpucounters.cpp index 7f3c16e4..ea4122f5 100644 --- a/src/cpucounters.cpp +++ b/src/cpucounters.cpp @@ -1941,7 +1941,6 @@ void PCM::initUncoreObjects() switch (cpu_model) { case ICX: - case SNOWRIDGE: case SPR: case EMR: case GNR: @@ -2393,27 +2392,7 @@ void PCM::initUncorePMUsDirect() } } break; - case PCM::SNOWRIDGE: - for (uint32 s = 0; s < (uint32)num_sockets; ++s) - { - auto & handle = MSR[socketRefCore[s]]; - for (int unit = 0; unit < SNR_IIO_STACK_COUNT; ++unit) - { - iioPMUs[s][unit] = UncorePMU( - std::make_shared(handle, SNR_IIO_CBDMA_UNIT_CTL + SNR_IIO_PM_REG_STEP * unit), - std::make_shared(handle, SNR_IIO_CBDMA_CTL0 + SNR_IIO_PM_REG_STEP * unit + 0), - std::make_shared(handle, SNR_IIO_CBDMA_CTL0 + SNR_IIO_PM_REG_STEP * unit + 1), - std::make_shared(handle, SNR_IIO_CBDMA_CTL0 + SNR_IIO_PM_REG_STEP * unit + 2), - std::make_shared(handle, SNR_IIO_CBDMA_CTL0 + SNR_IIO_PM_REG_STEP * unit + 3), - std::make_shared(handle, SNR_IIO_CBDMA_CTR0 + SNR_IIO_PM_REG_STEP * unit + 0), - std::make_shared(handle, SNR_IIO_CBDMA_CTR0 + SNR_IIO_PM_REG_STEP * unit + 1), - std::make_shared(handle, SNR_IIO_CBDMA_CTR0 + SNR_IIO_PM_REG_STEP * unit + 2), - std::make_shared(handle, SNR_IIO_CBDMA_CTR0 + SNR_IIO_PM_REG_STEP * unit + 3) - ); - } - } - break; - + case PCM::SPR: case PCM::EMR: for (uint32 s = 0; s < (uint32)num_sockets; ++s) @@ -2632,12 +2611,6 @@ void PCM::initUncorePMUsDirect() IRP_CTR_REG_OFFSET = ICX_IRP_CTR_REG_OFFSET; IRP_UNIT_CTL = ICX_IRP_UNIT_CTL; break; - case SNOWRIDGE: - irpStacks = SNR_IIO_STACK_COUNT; - IRP_CTL_REG_OFFSET = SNR_IRP_CTL_REG_OFFSET; - IRP_CTR_REG_OFFSET = SNR_IRP_CTR_REG_OFFSET; - IRP_UNIT_CTL = SNR_IRP_UNIT_CTL; - break; case SPR: case EMR: irpStacks = SPR_M2IOSF_NUM; @@ -7603,10 +7576,6 @@ void ServerUncorePMUs::initRegisterLocations(const PCM * pcm) } else if (cpu_model == PCM::SNOWRIDGE) { - PCM_PCICFG_M2M_INIT(0, SERVER) - PCM_PCICFG_M2M_INIT(1, SERVER) - PCM_PCICFG_M2M_INIT(2, SERVER) - PCM_PCICFG_M2M_INIT(3, SERVER) } else { diff --git a/src/cpucounters.h b/src/cpucounters.h index 8a02e69f..ab1d4778 100644 --- a/src/cpucounters.h +++ b/src/cpucounters.h @@ -1845,7 +1845,7 @@ class PCM_API PCM APOLLO_LAKE = 92, GEMINI_LAKE = 122, DENVERTON = 95, - SNOWRIDGE = 134, + SNOWRIDGE = 150, // fake Elkhart Lake CLARKDALE = 37, WESTMERE_EP = 44, NEHALEM_EX = 46, @@ -2184,7 +2184,6 @@ class PCM_API PCM case BDX_DE: case SKX: case ICX: - case SNOWRIDGE: case SPR: case EMR: case GNR: @@ -2574,7 +2573,6 @@ class PCM_API PCM return ( cpu_model == PCM::SKX || cpu_model == PCM::ICX - || cpu_model == PCM::SNOWRIDGE || cpu_model == PCM::SPR || cpu_model == PCM::EMR || cpu_model == PCM::SRF @@ -2621,7 +2619,6 @@ class PCM_API PCM isCLX() || isCPX() || cpu_model == PCM::ICX - || cpu_model == PCM::SNOWRIDGE || cpu_model == SPR || cpu_model == EMR ); @@ -2633,7 +2630,6 @@ class PCM_API PCM isCLX() || isCPX() || cpu_model == PCM::ICX - || cpu_model == PCM::SNOWRIDGE ); } @@ -2657,7 +2653,6 @@ class PCM_API PCM #endif || ICX == cpu_model || SPR == cpu_model - || SNOWRIDGE == cpu_model ); } @@ -2672,7 +2667,6 @@ class PCM_API PCM { return ( cpu_model == PCM::JAKETOWN - || cpu_model == PCM::SNOWRIDGE || cpu_model == PCM::IVYTOWN || cpu_model == PCM::HASWELLX || cpu_model == PCM::BDX_DE