Push 2024 11 22

.github/workflows/ci-test.yml

@@ -28,12 +28,13 @@ jobs:
       run: |
         cmake --version
         rm -rf ${{ github.workspace }}/build
-        cmake -B ${{ github.workspace }}/build
+        cmake -B ${{ github.workspace }}/build -DPCM_NO_ASAN=OFF
     - name: Build
       run: |
         g++ --version
         cd ${{ github.workspace }}/build
         make -j$(nproc)
+        ldd bin/pcm
     - name: Test
       run: |
         set -o pipefail

CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright (c) 2022, Intel Corporation
+# Copyright (c) 2022-2024, Intel Corporation
 
 cmake_minimum_required(VERSION 3.5)
 
@@ -145,6 +145,9 @@ if(PCM_FUZZ)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FUZZER_OPTIONS}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FUZZER_OPTIONS}")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${FUZZER_OPTIONS}")
+    message(STATUS "CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}")
+    message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
+    message(STATUS "CMAKE_EXE_LINKER_FLAGS: ${CMAKE_EXE_LINKER_FLAGS}")
 endif(PCM_FUZZ)
 
 #######################

src/cpucounters.cpp

@@ -724,6 +724,7 @@ void PCM::initCStateSupportTables()
         case RPL:
         case MTL:
         case LNL:
+        case ARL:
         case SNOWRIDGE:
         case ELKHART_LAKE:
         case JASPER_LAKE:
@@ -803,6 +804,7 @@ void PCM::initCStateSupportTables()
         case RPL:
         case MTL:
         case LNL:
+        case ARL:
         case SNOWRIDGE:
         case ELKHART_LAKE:
         case JASPER_LAKE:
@@ -1662,6 +1664,7 @@ bool PCM::detectNominalFrequency()
                || cpu_family_model == RPL
                || cpu_family_model == MTL
                || cpu_family_model == LNL
+               || cpu_family_model == ARL
                || cpu_family_model == SKX
                || cpu_family_model == ICX
                || cpu_family_model == SPR
@@ -1926,6 +1929,7 @@ void PCM::initUncoreObjects()
            case RPL: // TGLClientBW works fine for RPL
            case MTL: // TGLClientBW works fine for MTL
            case LNL: // TGLClientBW works fine for LNL
+           case ARL: // TGLClientBW works fine for ARL
                clientBW = std::make_shared<TGLClientBW>();
                break;
 /*         Disabled since ADLClientBW requires 2x multiplier for BW on top
@@ -3334,6 +3338,7 @@ bool PCM::isCPUModelSupported(const int model_)
             || model_ == RPL
             || model_ == MTL
             || model_ == LNL
+            || model_ == ARL
             || model_ == SKX
             || model_ == ICX
             || model_ == SPR
@@ -3367,6 +3372,9 @@ bool PCM::checkModel()
         case CML_1:
             cpu_family_model = CML;
             break;
+        case ARL_1:
+            cpu_family_model = ARL;
+            break;
         case ICL_1:
             cpu_family_model = ICL;
             break;
@@ -3510,7 +3518,12 @@ PCM::ErrorCode PCM::program(const PCM::ProgramMode mode_, const void * parameter
         canUsePerf = false;
         if (!silent) std::cerr << "Installed Linux kernel perf does not support hardware top-down level-1 counters. Using direct PMU programming instead.\n";
     }
-    if (canUsePerf && (cpu_family_model == ADL || cpu_family_model == RPL || cpu_family_model == MTL || cpu_family_model == LNL))
+    if (canUsePerf &&    (cpu_family_model == ADL
+                       || cpu_family_model == RPL
+                       || cpu_family_model == MTL
+                       || cpu_family_model == LNL
+                       || cpu_family_model == ARL
+                         ))
     {
         canUsePerf = false;
         if (!silent) std::cerr << "Linux kernel perf rejects an architectural event on your platform. Using direct PMU programming instead.\n";
@@ -3598,6 +3611,7 @@ PCM::ErrorCode PCM::program(const PCM::ProgramMode mode_, const void * parameter
             case RPL:
             case MTL:
             case LNL:
+            case ARL:
                 LLCArchEventInit(hybridAtomEventDesc);
                 hybridAtomEventDesc[2].event_number = SKL_MEM_LOAD_RETIRED_L2_MISS_EVTNR;
                 hybridAtomEventDesc[2].umask_value = SKL_MEM_LOAD_RETIRED_L2_MISS_UMASK;
@@ -4957,6 +4971,8 @@ const char * PCM::getUArchCodename(const int32 cpu_family_model_param) const
             return "Meteor Lake";
         case LNL:
             return "Lunar Lake";
+        case ARL:
+            return "Arrow Lake";
         case SKX:
             if (cpu_family_model_param >= 0)
             {

src/cpucounters.h

@@ -1639,6 +1639,7 @@ class PCM_API PCM
             case RPL:
             case MTL:
             case LNL:
+            case ARL:
                 if (topology[coreID].core_type == TopologyEntry::Atom)
                 {
                     return std::make_pair(OFFCORE_RESPONSE_0_EVTNR, event + 1);
@@ -1655,6 +1656,7 @@ class PCM_API PCM
        case RPL:
        case MTL:
        case LNL:
+       case ARL:
            useGLCOCREvent = true;
            break;
        }
@@ -1892,6 +1894,8 @@ class PCM_API PCM
         RPL_3 =         PCM_CPU_FAMILY_MODEL(6, 0xbe),
         MTL =           PCM_CPU_FAMILY_MODEL(6, 0xAA),
         LNL =           PCM_CPU_FAMILY_MODEL(6, 0xBD),
+        ARL =           PCM_CPU_FAMILY_MODEL(6, 197),
+        ARL_1 =         PCM_CPU_FAMILY_MODEL(6, 198),
         BDX =           PCM_CPU_FAMILY_MODEL(6, 79),
         KNL =           PCM_CPU_FAMILY_MODEL(6, 87),
         SKL =           PCM_CPU_FAMILY_MODEL(6, 94),
@@ -2128,6 +2132,7 @@ class PCM_API PCM
         case MTL:
             return 6;
         case LNL:
+        case ARL:
             return 12;
         case SNOWRIDGE:
         case ELKHART_LAKE:
@@ -2477,6 +2482,7 @@ class PCM_API PCM
                  || cpu_family_model == PCM::RPL
                  || cpu_family_model == PCM::MTL
                  || cpu_family_model == PCM::LNL
+                 || cpu_family_model == PCM::ARL
                  || cpu_family_model == PCM::SPR
                  || cpu_family_model == PCM::EMR
                  || cpu_family_model == PCM::GNR
@@ -2789,6 +2795,7 @@ class PCM_API PCM
             || cpu_family_model == RPL
             || cpu_family_model == MTL
             || cpu_family_model == LNL
+            || cpu_family_model == ARL
             || useSKLPath()
             ;
     }
@@ -4298,6 +4305,7 @@ uint64 getL2CacheMisses(const CounterStateType & before, const CounterStateType
         || cpu_family_model == PCM::RPL
         || cpu_family_model == PCM::MTL
         || cpu_family_model == PCM::LNL
+        || cpu_family_model == PCM::ARL
         ) {
         return after.Event[BasicCounterState::SKLL2MissPos] - before.Event[BasicCounterState::SKLL2MissPos];
     }
@@ -4413,6 +4421,7 @@ uint64 getL3CacheHitsSnoop(const CounterStateType & before, const CounterStateTy
         || cpu_family_model == PCM::RPL
         || cpu_family_model == PCM::MTL
         || cpu_family_model == PCM::LNL
+        || cpu_family_model == PCM::ARL
         )
     {
         const int64 misses = getL3CacheMisses(before, after);

tests/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright (c) 2022, Intel Corporation
+# Copyright (c) 2022-2024, Intel Corporation
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/tests)
 
@@ -18,7 +18,7 @@ if(UNIX)
 
 endif(UNIX)
 
-if(FUZZ)
+if(PCM_FUZZ)
     find_package(OpenSSL REQUIRED)
     set(SSL_LIBS OpenSSL::SSL OpenSSL::Crypto)
     add_executable(urltest-fuzz urltest-fuzz.cpp)

tests/fuzz.sh

@@ -15,13 +15,14 @@ export LSAN_OPTIONS=suppressions="pcm_asan_suppression_file"
 
 echo "Running fuzz tests with running time multiplier $factor"
 
-CC=`which clang` CXX=`which clang++` cmake ..  -DCMAKE_BUILD_TYPE=Debug -DFUZZ=1 && mkdir -p corpus &&
+CC=`which clang` CXX=`which clang++` cmake ..  -DCMAKE_BUILD_TYPE=Debug -DPCM_FUZZ=ON && mkdir -p corpus &&
 make urltest-fuzz \
      pcm-fuzz \
      pcm-memory-fuzz \
      pcm-sensor-server-fuzz \
      pcm-sensor-server-ssl-fuzz \
      -j &&
+ldd bin/tests/pcm-fuzz &&
 rm -rf corpus/* &&
 printf '%b' "GET / HTTP/1.1\r\nHost: localhost\r\nAccept: */*\r\n\r\n" > corpus/1 &&
 printf '%b' "GET /metrics HTTP/1.1\r\nHost: localhost\r\nAccept: */*\r\n\r\n" > corpus/2 &&