From 5308c10a48b78c446c1e77054ddc40b7066fb764 Mon Sep 17 00:00:00 2001 From: "Dementiev, Roman" Date: Tue, 1 Oct 2024 15:09:36 +0200 Subject: [PATCH 01/13] drop unused socket variable Change-Id: I7dec47e9c17d91f34fe1f0c2d754a39b1d922078 --- src/uncore_pmu_discovery.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/uncore_pmu_discovery.cpp b/src/uncore_pmu_discovery.cpp index 61fa4493..62e47516 100644 --- a/src/uncore_pmu_discovery.cpp +++ b/src/uncore_pmu_discovery.cpp @@ -15,8 +15,7 @@ UncorePMUDiscovery::UncorePMUDiscovery() { return; } - unsigned socket = 0; - auto processTables = [&socket,this](const uint64 bar, const VSEC &) + auto processTables = [this](const uint64 bar, const VSEC &) { constexpr size_t UncoreDiscoverySize = 3UL; union UncoreGlobalDiscovery { @@ -45,7 +44,6 @@ UncorePMUDiscovery::UncorePMUDiscovery() boxPMUMap[unit.pmu.boxType].push_back(unit.pmu); } boxPMUs.push_back(boxPMUMap); - ++socket; }; try { processDVSEC([](const VSEC & vsec) From 17c6e494ec9d258eb363974dbbdd2107291ae528 Mon Sep 17 00:00:00 2001 From: "Dementiev, Roman" Date: Wed, 10 Jul 2024 15:57:41 +0200 Subject: [PATCH 02/13] perf optimization for accumulating socket CStateResidency Change-Id: Ib7ff9a7faaa7387b57d4ca7e00cae935da312821 --- src/cpucounters.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/cpucounters.cpp b/src/cpucounters.cpp index 55953671..eb899646 100644 --- a/src/cpucounters.cpp +++ b/src/cpucounters.cpp @@ -6529,7 +6529,10 @@ void PCM::readAndAggregatePackageCStateResidencies(std::shared_ptr *)(result.CStateResidency + i), cCStateResidency[i]); + if (cCStateResidency[i]) + { + atomic_fetch_add((std::atomic *)(result.CStateResidency + i), cCStateResidency[i]); + } } } From 3ff53d6859c7709f5ab0ad667b9ca5eb5fb21a47 Mon Sep 17 00:00:00 2001 From: "Dementiev, Roman" Date: Wed, 2 Oct 2024 08:23:05 +0200 Subject: [PATCH 03/13] pcm-numa: enable support for GNR Change-Id: Iaadc638842f87a7713c3057fe0a75aa2268fdfa1 --- src/cpucounters.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cpucounters.cpp b/src/cpucounters.cpp index eb899646..31386bd4 100644 --- a/src/cpucounters.cpp +++ b/src/cpucounters.cpp @@ -10987,6 +10987,7 @@ void PCM::setupCustomCoreEventsForNuma(PCM::ExtendedCustomCoreEventDescription& break; case PCM::SPR: case PCM::EMR: + case PCM::GNR: std::cout << "INFO: Monitored accesses include demand + L2 cache prefetcher, code read and RFO.\n"; // OCR.READS_TO_CORE.LOCAL_DRAM conf.OffcoreResponseMsrValue[0] = 0x104004477; From 5b7f2ec1a4aef75281bc6265571793bda43bf6db Mon Sep 17 00:00:00 2001 From: opcm Date: Sat, 5 Oct 2024 21:17:37 +0200 Subject: [PATCH 04/13] disable asan on MacOS --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index e3de93a8..c7d99535 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -101,6 +101,10 @@ if(UNIX) # APPLE, LINUX, FREE_BSD elseif() set (PCM_DYNAMIC "") endif() + if(APPLE) + set(PCM_NO_ASAN ON) + message(STATUS "AddressSanitizer is currently disabled on MacOS") + endif() if(PCM_NO_ASAN) message(STATUS "AddressSanitizer is disabled") set(PCM_ASAN "") From 7d9a662545be9b18a1b6c972336dc11ca8136a36 Mon Sep 17 00:00:00 2001 From: "Dementiev, Roman" Date: Sun, 6 Oct 2024 09:13:42 +0200 Subject: [PATCH 05/13] use dynamic libasan on arch Linux Change-Id: I64c40700d62ebe39c9f47cf0ba384fa09f15bee5 --- src/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b0b22152..115f0c72 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -35,6 +35,10 @@ if(NOT PCM_NO_ASAN) set(PCM_NO_STATIC_LIBASAN ON) message(STATUS "CentOS detected, using dynamic libasan") endif() + if(OS_ID STREQUAL "arch") + set(PCM_NO_STATIC_LIBASAN ON) + message(STATUS "arch Linux detected, using dynamic libasan") + endif() endif() if(UNIX) # LINUX, FREE_BSD, APPLE From 9fd979889c028ba73f4cf5650732986dbd040e93 Mon Sep 17 00:00:00 2001 From: "Dementiev, Roman" Date: Sun, 6 Oct 2024 09:31:40 +0200 Subject: [PATCH 06/13] improve documentation Change-Id: I5561d4f64632235340faa619d490266f991c7f1e --- README.md | 2 +- src/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1a7ebf5b..5f8ebed2 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ or clone the repository first, and then update submodules with: git submodule update --init --recursive ``` -Install cmake then: +Install cmake (and libasan on Linux) then: ``` mkdir build diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 115f0c72..f9451b68 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -84,7 +84,7 @@ if(UNIX) # LINUX, FREE_BSD, APPLE set(PCM_DYNAMIC_ASAN "") set(PCM_STATIC_ASAN "-static-libasan") message(STATUS "Using static libasan") - message(STATUS "To use dynamic libasan, use -DPCM_NO_STATIC_LIBASAN=1 option (required for CentOS)") + message(STATUS "To use dynamic libasan, use -DPCM_NO_STATIC_LIBASAN=1 option (required for CentOS and arch Linux)") endif() endif() From 134feeac459814f3ec9786298dde7de0bc11c3e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 20:05:03 +0000 Subject: [PATCH 07/13] Bump fedora from `5ce8497` to `b7b4b22` Bumps fedora from `5ce8497` to `b7b4b22`. --- updated-dependencies: - dependency-name: fedora dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 906d37a6..0a8a989b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:40@sha256:5ce8497aeea599bf6b54ab3979133923d82aaa4f6ca5ced1812611b197c79eb0 as builder +FROM fedora:40@sha256:b7b4b222c2a433e831c006a49a397009640cc30e097824410a35b160be4a176b as builder # Dockerfile for Intel PCM sensor server # SPDX-License-Identifier: BSD-3-Clause # Copyright (c) 2020-2024 Intel Corporation @@ -7,7 +7,7 @@ RUN dnf -y install gcc-c++ git findutils make cmake openssl openssl-devel libasa COPY . /tmp/pcm RUN cd /tmp/pcm && mkdir build && cd build && cmake .. && make -j -FROM fedora:40@sha256:5ce8497aeea599bf6b54ab3979133923d82aaa4f6ca5ced1812611b197c79eb0 +FROM fedora:40@sha256:b7b4b222c2a433e831c006a49a397009640cc30e097824410a35b160be4a176b COPY --from=builder /tmp/pcm/build/bin/* /usr/local/bin/ ENV PCM_NO_PERF=1 From 2adc0e7f263f87e66583fcc77e27b798f446248e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 19:51:51 +0000 Subject: [PATCH 08/13] Bump docker/build-push-action from 5.1.0 to 6.9.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5.1.0 to 6.9.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/4a13e500e55cf31b7a5d59a38ab2040ab0f42f56...4f58ea79222b3b9dc2c8bbdd6debcef730109a75) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4807613c..e9a7bd42 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -58,7 +58,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0 + uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0 with: platforms: linux/amd64 push: true From 6afbe9d94e1e5172a0ff0e988db754324e8c3fb6 Mon Sep 17 00:00:00 2001 From: opcm Date: Sun, 6 Oct 2024 11:32:01 +0200 Subject: [PATCH 09/13] Update Dockerfile address a warning --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0a8a989b..cbd6cb44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:40@sha256:b7b4b222c2a433e831c006a49a397009640cc30e097824410a35b160be4a176b as builder +FROM fedora:40@sha256:b7b4b222c2a433e831c006a49a397009640cc30e097824410a35b160be4a176b AS builder # Dockerfile for Intel PCM sensor server # SPDX-License-Identifier: BSD-3-Clause # Copyright (c) 2020-2024 Intel Corporation From 50ea9feaa613db6a0434f0ca32453d1787208faf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 19:23:08 +0000 Subject: [PATCH 10/13] Bump docker/login-action from 3.1.0 to 3.3.0 Bumps [docker/login-action](https://github.com/docker/login-action) from 3.1.0 to 3.3.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/e92390c5fb421da1463c202d546fed0ec5c39f20...9780b0c442fbb1117ed29e0efdff1e18412f7567) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e9a7bd42..1c9a44ab 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -45,13 +45,13 @@ jobs: ${{ runner.os }}-buildx- - name: Login to DockerHub - uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 + uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Log in to the Container registry - uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 + uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 with: registry: ghcr.io username: ${{ github.actor }} From 2560a41f2584ad25ffa21831f4bdaf9ff690917f Mon Sep 17 00:00:00 2001 From: opcm Date: Sun, 6 Oct 2024 09:53:22 +0000 Subject: [PATCH 11/13] update dependencies --- perfmon | 2 +- src/simdjson | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perfmon b/perfmon index d2d13132..eef1d0d8 160000 --- a/perfmon +++ b/perfmon @@ -1 +1 @@ -Subproject commit d2d13132c2f9b367fd9956cb7441a887ef590f53 +Subproject commit eef1d0d88523a183ca514755b295daee5acb303a diff --git a/src/simdjson b/src/simdjson index 3620e9d1..e341c8b4 160000 --- a/src/simdjson +++ b/src/simdjson @@ -1 +1 @@ -Subproject commit 3620e9d151a1a74ee8132af3770f3e28b4b4b66c +Subproject commit e341c8b43861b43de29c48ab65f292d997096953 From fd66271ee301e41e0869e82ea7fc35d14f8c99e0 Mon Sep 17 00:00:00 2001 From: Otto Bruggeman Date: Fri, 11 Oct 2024 19:35:39 +0200 Subject: [PATCH 12/13] Rename socket to socket_id to make TopologyEntry members consistent (#700) * Rename socket to socket_id to make TopologyEntry members consistent --- src/MacMSRDriver/PcmMsr/PcmMsr.cpp | 2 +- src/cpucounters.cpp | 54 +++++++++++++++--------------- src/cpucounters.h | 2 +- src/topology.h | 8 ++--- src/topologyentry.h | 6 ++-- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/MacMSRDriver/PcmMsr/PcmMsr.cpp b/src/MacMSRDriver/PcmMsr/PcmMsr.cpp index 3f51b740..2e9b3154 100644 --- a/src/MacMSRDriver/PcmMsr/PcmMsr.cpp +++ b/src/MacMSRDriver/PcmMsr/PcmMsr.cpp @@ -194,7 +194,7 @@ IOReturn PcmMsrDriverClassName::buildTopology(TopologyEntry* odata, uint32_t inp odata[i].thread_id = topologies[i].thread_id; odata[i].core_id = topologies[i].core_id; odata[i].tile_id = topologies[i].tile_id; - odata[i].socket = topologies[i].socket; + odata[i].socket_id = topologies[i].socket_id; } IOFreeAligned(topologies, topologyBufferSize); diff --git a/src/cpucounters.cpp b/src/cpucounters.cpp index 31386bd4..8c8e0b2f 100644 --- a/src/cpucounters.cpp +++ b/src/cpucounters.cpp @@ -652,14 +652,14 @@ void PCM::initRDT() MSR[core]->read(IA32_PQR_ASSOC, &msr_pqr_assoc); //std::cout << "initRMID reading IA32_PQR_ASSOC 0x" << std::hex << msr_pqr_assoc << std::dec << "\n"; - //std::cout << "Socket Id : " << topology[core].socket; + //std::cout << "Socket Id : " << topology[core].socket_id; msr_pqr_assoc &= 0xffffffff00000000ULL; - msr_pqr_assoc |= (uint64)(rmid[topology[core].socket] & ((1ULL<<10)-1ULL)); + msr_pqr_assoc |= (uint64)(rmid[topology[core].socket_id] & ((1ULL<<10)-1ULL)); //std::cout << "initRMID writing IA32_PQR_ASSOC 0x" << std::hex << msr_pqr_assoc << std::dec << "\n"; //Write 0xC8F MSR with new RMID for each core MSR[core]->write(IA32_PQR_ASSOC,msr_pqr_assoc); - msr_qm_evtsel = static_cast(rmid[topology[core].socket] & ((1ULL<<10)-1ULL)); + msr_qm_evtsel = static_cast(rmid[topology[core].socket_id] & ((1ULL<<10)-1ULL)); msr_qm_evtsel <<= 32; //Write 0xC8D MSR with new RMID for each core //std::cout << "initRMID writing IA32_QM_EVTSEL 0x" << std::hex << msr_qm_evtsel << std::dec << "\n"; @@ -675,7 +675,7 @@ void PCM::initRDT() memory_bw_total.push_back(std::make_shared(new CounterWidthExtender::MBTCounter(MSR[core]), 24, 1000)); } } - rmid[topology[core].socket] --; + rmid[topology[core].socket_id] --; //std::cout << std::flush; // Explicitly flush after each iteration } /* Get The scaling factor by running CPUID.0xF.0x1 instruction */ @@ -1188,7 +1188,7 @@ bool PCM::discoverSystemTopology() } entry.die_id = getID(apic_id, TopologyEntry::DomainTypeID::DieDomain); entry.die_grp_id = getID(apic_id, TopologyEntry::DomainTypeID::DieGrpDomain); - entry.socket = getID(apic_id, TopologyEntry::DomainTypeID::SocketPackageDomain); + entry.socket_id = getID(apic_id, TopologyEntry::DomainTypeID::SocketPackageDomain); } else { @@ -1281,7 +1281,7 @@ bool PCM::discoverSystemTopology() } topology.push_back(entry); - socketIdMap[entry.socket] = 0; + socketIdMap[entry.socket_id] = 0; } deleteAndNullifyArray(base_slpi); @@ -1329,7 +1329,7 @@ bool PCM::discoverSystemTopology() } topology[entry.os_id] = entry; - socketIdMap[entry.socket] = 0; + socketIdMap[entry.socket_id] = 0; ++num_online_cores; } catch (std::exception &) @@ -1368,10 +1368,10 @@ bool PCM::discoverSystemTopology() return false; } - if (entry.socket == 0 && entry.core_id == 0) ++threads_per_core; + if (entry.socket_id == 0 && entry.core_id == 0) ++threads_per_core; topology.push_back(entry); - socketIdMap[entry.socket] = 0; + socketIdMap[entry.socket_id] = 0; } #else // Getting processor info for Mac OS @@ -1419,10 +1419,10 @@ bool PCM::discoverSystemTopology() return false; } for(int i = 0; i < num_cores; i++){ - socketIdMap[entries[i].socket] = 0; + socketIdMap[entries[i].socket_id] = 0; if(entries[i].os_id >= 0) { - if(entries[i].core_id == 0 && entries[i].socket == 0) ++threads_per_core; + if(entries[i].core_id == 0 && entries[i].socket_id == 0) ++threads_per_core; if (populateHybridEntry(entries[i], i) == false) { return false; @@ -1464,7 +1464,7 @@ bool PCM::discoverSystemTopology() for (int i = 0; (i < (int)num_cores) && (!socketIdMap.empty()); ++i) { if(isCoreOnline((int32)i)) - topology[i].socket = socketIdMap[topology[i].socket]; + topology[i].socket_id = socketIdMap[topology[i].socket_id]; } #if 0 @@ -1472,14 +1472,14 @@ bool PCM::discoverSystemTopology() std::cerr << "Topology:\nsocket os_id core_id\n"; for (int i = 0; i < num_cores; ++i) { - std::cerr << topology[i].socket << " " << topology[i].os_id << " " << topology[i].core_id << "\n"; + std::cerr << topology[i].socket_id << " " << topology[i].os_id << " " << topology[i].core_id << "\n"; } #endif if (threads_per_core == 0) { for (int i = 0; i < (int)num_cores; ++i) { - if (topology[i].socket == topology[0].socket && topology[i].core_id == topology[0].core_id) + if (topology[i].socket_id == topology[0].socket_id && topology[i].core_id == topology[0].core_id) ++threads_per_core; } assert(threads_per_core != 0); @@ -1494,7 +1494,7 @@ bool PCM::discoverSystemTopology() { if(isCoreOnline(i)) { - socketRefCore[topology[i].socket] = i; + socketRefCore[topology[i].socket_id] = i; } } @@ -3132,16 +3132,16 @@ void PCM::printDetailedSystemTopology(const int detailLevel) if (detailLevel > 0) std::cerr << std::setw(16) << it->module_id; std::cerr << std::setw(16) << it->tile_id; if (detailLevel > 0) std::cerr << std::setw(16) << it->die_id << std::setw(16) << it->die_grp_id; - std::cerr << std::setw(16) << it->socket + std::cerr << std::setw(16) << it->socket_id << std::setw(16) << it->getCoreTypeStr() << std::setw(16) << it->native_cpu_model << "\n"; - if (std::find(core_id_by_socket[it->socket].begin(), core_id_by_socket[it->socket].end(), it->core_id) - == core_id_by_socket[it->socket].end()) - core_id_by_socket[it->socket].push_back(it->core_id); + if (std::find(core_id_by_socket[it->socket_id].begin(), core_id_by_socket[it->socket_id].end(), it->core_id) + == core_id_by_socket[it->socket_id].end()) + core_id_by_socket[it->socket_id].push_back(it->core_id); // add socket offset to distinguish cores and tiles from different sockets - os_id_by_core[(it->socket << 15) + it->core_id].push_back(it->os_id); - os_id_by_tile[(it->socket << 15) + it->tile_id].push_back(it->os_id); + os_id_by_core[(it->socket_id << 15) + it->core_id].push_back(it->os_id); + os_id_by_tile[(it->socket_id << 15) + it->tile_id].push_back(it->os_id); ++counter; } @@ -3233,7 +3233,7 @@ void PCM::showSpecControlMSRs() bool PCM::isCoreOnline(int32 os_core_id) const { - return (topology[os_core_id].os_id != -1) && (topology[os_core_id].core_id != -1) && (topology[os_core_id].socket != -1); + return (topology[os_core_id].os_id != -1) && (topology[os_core_id].core_id != -1) && (topology[os_core_id].socket_id != -1); } bool PCM::isSocketOnline(int32 socket_id) const @@ -6674,7 +6674,7 @@ void PCM::readQPICounters(SystemCounterState & result) if(core == socketRefCore[0]) MSR[core]->read(W_MSR_PMON_FIXED_CTR, &(result.uncoreTSC)); - uint32 s = topology[core].socket; + uint32 s = topology[core].socket_id; if (!SocketProcessed[s]) { @@ -6802,7 +6802,7 @@ SocketCounterState PCM::getSocketCounterState(uint32 socket) { // reading core and uncore counter states for (int32 core = 0; core < num_cores; ++core) - if (isCoreOnline(core) && (topology[core].socket == int32(socket))) + if (isCoreOnline(core) && (topology[core].socket_id == int32(socket))) result.readAndAggregate(MSR[core]); readAndAggregateUncoreMCCounters(socket, result); @@ -6836,7 +6836,7 @@ void PCM::getAllCounterStates(SystemCounterState & systemState, std::vectorapicId() == te.socket ) { + if ( socket->apicId() == te.socket_id ) { Core* core = nullptr; if ( (core = socket->findCoreByTileID( te.tile_id )) == nullptr ) { // std::cerr << "SystemRoot::addThread: " << te.tile_id << ", " << osID << "\n"; - core = new Core( pcm_, te.core_id, te.tile_id, te.socket ); + core = new Core( pcm_, te.core_id, te.tile_id, te.socket_id ); // std::cerr << "new Core ThreadID: " << te.thread_id << "\n"; core->addHyperThreadInfo( te.thread_id, osID ); socket->addCore( core ); - // std::cerr << "Added core " << te.core_id << " with os_id " << osID << ", threadid " << te.thread_id << " and tileid " << te.tile_id << " to socket " << te.socket << ".\n"; + // std::cerr << "Added core " << te.core_id << " with os_id " << osID << ", threadid " << te.thread_id << " and tileid " << te.tile_id << " to socket " << te.socket_id << ".\n"; } else { // std::cerr << "existing Core ThreadID: " << te.thread_id << "\n"; core->addHyperThreadInfo( te.thread_id, osID ); - // std::cerr << "Augmented core " << te.core_id << " with osID " << osID << " and threadid " << te.thread_id << " for the hyperthread to socket " << te.socket << ".\n"; + // std::cerr << "Augmented core " << te.core_id << " with osID " << osID << " and threadid " << te.thread_id << " for the hyperthread to socket " << te.socket_id << ".\n"; } entryAdded = true; break; diff --git a/src/topologyentry.h b/src/topologyentry.h index 39ffe153..d86f9f9b 100644 --- a/src/topologyentry.h +++ b/src/topologyentry.h @@ -17,7 +17,7 @@ struct PCM_API TopologyEntry // describes a core int32 tile_id; // tile is a constalation of 1 or more cores sharing same L2 cache. Unique for entire system int32 die_id; int32 die_grp_id; - int32 socket; + int32 socket_id; int32 native_cpu_model = -1; enum DomainTypeID { @@ -38,7 +38,7 @@ struct PCM_API TopologyEntry // describes a core }; CoreType core_type = Invalid; - TopologyEntry() : os_id(-1), thread_id (-1), core_id(-1), module_id(-1), tile_id(-1), die_id(-1), die_grp_id(-1), socket(-1) { } + TopologyEntry() : os_id(-1), thread_id (-1), core_id(-1), module_id(-1), tile_id(-1), die_id(-1), die_grp_id(-1), socket_id(-1) { } const char* getCoreTypeStr() { switch (core_type) @@ -73,7 +73,7 @@ inline void fillEntry(TopologyEntry & entry, const uint32 & smtMaskWidth, const { entry.thread_id = smtMaskWidth ? extract_bits_ui(apic_id, 0, smtMaskWidth - 1) : 0; entry.core_id = (smtMaskWidth + coreMaskWidth) ? extract_bits_ui(apic_id, smtMaskWidth, smtMaskWidth + coreMaskWidth - 1) : 0; - entry.socket = extract_bits_ui(apic_id, smtMaskWidth + coreMaskWidth, 31); + entry.socket_id = extract_bits_ui(apic_id, smtMaskWidth + coreMaskWidth, 31); entry.tile_id = extract_bits_ui(apic_id, l2CacheMaskShift, 31); } From bbebbfd831cd19abf3928ae487dba4de90557a70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 10:40:34 +0000 Subject: [PATCH 13/13] Bump cross-platform-actions/action from 0.23.0 to 0.25.0 Bumps [cross-platform-actions/action](https://github.com/cross-platform-actions/action) from 0.23.0 to 0.25.0. - [Release notes](https://github.com/cross-platform-actions/action/releases) - [Changelog](https://github.com/cross-platform-actions/action/blob/master/changelog.md) - [Commits](https://github.com/cross-platform-actions/action/compare/a4a7327f8112bc2513a07701786a0c3c1193583a...cdc9ee69ef84a5f2e59c9058335d9c57bcb4ac86) --- updated-dependencies: - dependency-name: cross-platform-actions/action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/freebsd_build.yml | 2 +- .github/workflows/freebsd_scan_build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/freebsd_build.yml b/.github/workflows/freebsd_build.yml index 32e0de75..987d2a32 100644 --- a/.github/workflows/freebsd_build.yml +++ b/.github/workflows/freebsd_build.yml @@ -25,7 +25,7 @@ jobs: submodules: recursive - name: build in FreeBSD VM id: build - uses: cross-platform-actions/action@a4a7327f8112bc2513a07701786a0c3c1193583a # v0.23.0 + uses: cross-platform-actions/action@cdc9ee69ef84a5f2e59c9058335d9c57bcb4ac86 # v0.25.0 with: memory: 2048 shell: sh diff --git a/.github/workflows/freebsd_scan_build.yml b/.github/workflows/freebsd_scan_build.yml index 8e048e08..2b0c8406 100644 --- a/.github/workflows/freebsd_scan_build.yml +++ b/.github/workflows/freebsd_scan_build.yml @@ -25,7 +25,7 @@ jobs: submodules: recursive - name: clang scan build in FreeBSD VM id: clang-scan-build - uses: cross-platform-actions/action@a4a7327f8112bc2513a07701786a0c3c1193583a # v0.23.0 + uses: cross-platform-actions/action@cdc9ee69ef84a5f2e59c9058335d9c57bcb4ac86 # v0.25.0 with: memory: 2048 shell: sh