Skip to content

Push 2025 09 09 #971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rdementi merged 3 commits into from
Sep 9, 2025
+14 −20
Merged

Push 2025 09 09 #971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e167798
fix compilation for memoptest
rdementi Sep 8, 2025
bda534b
make cpu family/model extraction fully compliant to the spec
rdementi Sep 8, 2025
e02fb65
Merge pull request #822 from intel-innersource/rdementi-2025-09-08
rdementi Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 13 additions & 19 deletions src/cpucounters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,29 +382,21 @@ int32 PCM::getMaxCustomCoreEvents()
return core_gen_counter_num_max;
}

/*
int PCM::getCPUModelFromCPUID()
{
static int result = -1;
if (result < 0)
{
PCM_CPUID_INFO cpuinfo;
pcm_cpuid(1, cpuinfo);
result = (((cpuinfo.array[0]) & 0xf0) >> 4) | ((cpuinfo.array[0] & 0xf0000) >> 12);
}
return result;
}
*/

int PCM::getCPUFamilyModelFromCPUID()
{
static int result = -1;
if (result < 0)
{
PCM_CPUID_INFO cpuinfo;
pcm_cpuid(1, cpuinfo);
const auto cpu_family_ = (((cpuinfo.array[0]) >> 8) & 0xf) | ((cpuinfo.array[0] & 0xf00000) >> 16);
const auto cpu_model_ = (((cpuinfo.array[0]) & 0xf0) >> 4) | ((cpuinfo.array[0] & 0xf0000) >> 12);
// follow https://www.felixcloutier.com/x86/cpuid#fig-3-6
unsigned int Family_ID = (cpuinfo.array[0] >> 8) & 0xF;
unsigned int Extended_Family_ID = (cpuinfo.array[0] >> 20) & 0xFF;
unsigned int Model_ID = (cpuinfo.array[0] >> 4) & 0xF;
unsigned int Extended_Model_ID = (cpuinfo.array[0] >> 16) & 0xF;
const auto cpu_family_ = (Family_ID != 0x0F) ? Family_ID : (Extended_Family_ID + Family_ID);
const auto cpu_model_ = (Family_ID == 0x06 || Family_ID == 0x0F) ? (Model_ID + (Extended_Model_ID << 4)) : Model_ID;

result = PCM_CPU_FAMILY_MODEL(cpu_family_, cpu_model_);
}
return result;
Expand Down Expand Up @@ -432,9 +424,11 @@ bool PCM::detectModel()
max_cpuid = cpuinfo.array[0];

pcm_cpuid(1, cpuinfo);
cpu_family = (((cpuinfo.array[0]) >> 8) & 0xf) | ((cpuinfo.array[0] & 0xf00000) >> 16);
cpu_model_private = (((cpuinfo.array[0]) & 0xf0) >> 4) | ((cpuinfo.array[0] & 0xf0000) >> 12);
cpu_family_model = PCM_CPU_FAMILY_MODEL(cpu_family, cpu_model_private);

DBG(2 , "cpuinfo.array[0]: 0x" , std::hex , cpuinfo.array[0] , std::dec);
cpu_family_model = getCPUFamilyModelFromCPUID();
cpu_family = (cpu_family_model >> 8) & 0xff;
cpu_model_private = cpu_family_model & 0xff;
cpu_stepping = cpuinfo.array[0] & 0x0f;

if (cpuinfo.reg.ecx & (1UL << 31UL)) {
Expand Down
2 changes: 1 addition & 1 deletion src/memoptest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ int main(int argc, char * argv[])
cout << "Bandwidth: " << (sizeof(T) * nelements * niter) / ((after_ts - before_ts) * 1024 * 1024) << " MByte/sec\n" << std::flush;
}

deleteAndNullifyArray(vector);
pcm::deleteAndNullifyArray(vector);

return 0;
}
Loading