Merge pull request #351 from opcm/push-2021-12-01

Push 2021 12 01

.github/workflows/ci-test.yml

@@ -0,0 +1,22 @@
+name: tests
+
+on:
+  push:
+    branches: [ '**' ]
+  pull_request:
+    branches: [ '**' ]
+
+jobs:
+  build:
+
+    runs-on: ci-test
+    if: ${{ github.repository != 'opcm/pcm' }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: make
+      run: |
+        g++ --version
+        git clone https://github.com/simdjson/simdjson.git
+        make -j
+        sh test.sh

PCM-Lib_Win/pcm-lib.vcxproj

@@ -191,7 +191,8 @@
     <ClCompile Include="..\winpmem\winpmem.cpp" />
     <ClCompile Include="..\msr.cpp" />
     <ClCompile Include="..\pci.cpp" />
-    <ClCompile Include="..\bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
+    <ClCompile Include="..\bw.cpp" />
+    <ClCompile Include="..\mmio.cpp" />
     <ClCompile Include="..\utils.cpp" />
     <ClCompile Include="..\debug.cpp" />
     <ClCompile Include="..\threadpool.cpp" />
@@ -206,7 +207,8 @@
     <ClInclude Include="pcm-lib.h" />
     <ClInclude Include="..\msr.h" />
     <ClInclude Include="..\pci.h" />
-    <ClInclude Include="..\bw.h" /> <ClInclude Include="..\mmio.h" />
+    <ClInclude Include="..\bw.h" />
+    <ClInclude Include="..\mmio.h" />
     <ClInclude Include="..\debug.h" />
     <ClInclude Include="..\threadpool.h" />
     <ClInclude Include="targetver.h" />

PCM-Raw_Win/pcm-raw-win.vcxproj

@@ -193,4 +193,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

PCM-Service_Win/AssemblyInfo.cpp

@@ -29,9 +29,9 @@ using namespace System::Security::Permissions;
 [assembly:AssemblyTitleAttribute("PCMService")];
 [assembly:AssemblyDescriptionAttribute("")];
 [assembly:AssemblyConfigurationAttribute("")];
-[assembly:AssemblyCompanyAttribute("Intel GmbH")];
+[assembly:AssemblyCompanyAttribute("Intel Corp")];
 [assembly:AssemblyProductAttribute("PCMService")];
-[assembly:AssemblyCopyrightAttribute("Copyright (c) Intel GmbH 2010")];
+[assembly:AssemblyCopyrightAttribute("Copyright (c) Intel Corp 2010-2021")];
 [assembly:AssemblyTrademarkAttribute("")];
 [assembly:AssemblyCultureAttribute("")];
 
@@ -50,7 +50,4 @@ using namespace System::Security::Permissions;
 
 [assembly:ComVisible(false)];
 
-[assembly:CLSCompliantAttribute(true)];
-
-[assembly:SecurityPermission(SecurityAction::RequestMinimum, UnmanagedCode = true)];
-
+[assembly:CLSCompliantAttribute(true)];

PCM_Win/pcm.vcxproj

@@ -156,7 +156,8 @@
     <ClCompile Include="..\winpmem\winpmem.cpp" />
     <ClCompile Include="..\msr.cpp" />
     <ClCompile Include="..\pci.cpp" />
-    <ClCompile Include="..\bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
+    <ClCompile Include="..\bw.cpp" />
+    <ClCompile Include="..\mmio.cpp" />
     <ClCompile Include="pcm.cpp" />
     <ClCompile Include="..\debug.cpp" />
     <ClCompile Include="..\threadpool.cpp" />
@@ -172,7 +173,8 @@
     <ClInclude Include="..\topology.h" />
     <ClInclude Include="..\msr.h" />
     <ClInclude Include="..\pci.h" />
-    <ClInclude Include="..\bw.h" /> <ClInclude Include="..\mmio.h" />
+    <ClInclude Include="..\bw.h" />
+    <ClInclude Include="..\mmio.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="..\types.h" />
     <ClInclude Include="windriver.h" />

PMURegisterDeclarations/GenuineIntel-6-55-4.json

@@ -98,6 +98,14 @@
             "Threshold":   {"Config": 0, "Position": 24, "Width": 8, "DefaultValue": 0}
         }
     },
+    "irp" : {
+        "programmable" : {
+            "EventCode":   {"Config": 0, "Position": 0, "Width": 8},
+            "UMask":       {"Config": 0, "Position": 8, "Width": 8},
+            "EdgeDetect":  {"Config": 0, "Position": 18, "Width": 1, "DefaultValue": 0},
+            "Threshold":   {"Config": 0, "Position": 24, "Width": 8, "DefaultValue": 0}
+        }
+    },
     "iio" : {
         "programmable" : {
             "EventCode":   {"Config": 0, "Position": 0, "Width": 8},

PMURegisterDeclarations/GenuineIntel-6-55-7.json

@@ -98,6 +98,14 @@
             "Threshold":   {"Config": 0, "Position": 24, "Width": 8, "DefaultValue": 0}
         }
     },
+    "irp" : {
+        "programmable" : {
+            "EventCode":   {"Config": 0, "Position": 0, "Width": 8},
+            "UMask":       {"Config": 0, "Position": 8, "Width": 8},
+            "EdgeDetect":  {"Config": 0, "Position": 18, "Width": 1, "DefaultValue": 0},
+            "Threshold":   {"Config": 0, "Position": 24, "Width": 8, "DefaultValue": 0}
+        }
+    },
     "iio" : {
         "programmable" : {
             "EventCode":   {"Config": 0, "Position": 0, "Width": 8},

PMURegisterDeclarations/GenuineIntel-6-6A-6.json

@@ -106,6 +106,14 @@
             "Threshold":   {"Config": 0, "Position": 24, "Width": 8, "DefaultValue": 0}
         }
     },
+    "irp" : {
+        "programmable" : {
+            "EventCode":   {"Config": 0, "Position": 0, "Width": 8},
+            "UMask":       {"Config": 0, "Position": 8, "Width": 8},
+            "EdgeDetect":  {"Config": 0, "Position": 18, "Width": 1, "DefaultValue": 0},
+            "Threshold":   {"Config": 0, "Position": 24, "Width": 8, "DefaultValue": 0}
+        }
+    },
     "pcu" : {
         "programmable" : {
             "EventCode":   {"Config": 0, "Position": 0, "Width": 8},

build_solution.bat

@@ -1,9 +1,9 @@
 
 REM change path to your VCVARS.BAT
-CALL "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\x86_amd64\vcvarsx86_amd64.bat"
-SET "PATH=C:\Program Files (x86)\MSBuild\14.0\Bin\amd64;%PATH%"
-REM CALL "c:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvarsamd64_x86.bat"
-REM SET "PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\amd64;%PATH%"
+REM CALL "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\x86_amd64\vcvarsx86_amd64.bat"
+REM SET "PATH=C:\Program Files (x86)\MSBuild\14.0\Bin\amd64;%PATH%"
+CALL "c:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvarsamd64_x86.bat"
+SET "PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\amd64;%PATH%"
 
    msbuild  pcm-all.sln /p:Configuration=Release;Platform=x64  /t:Clean,Build /m 
 

bw.cpp

@@ -74,7 +74,9 @@ namespace pcm {
         return result;
     }
 
-#define PCM_CLIENT_IMC_DRAM_IO_REQESTS  (0x5048)
+#define PCM_CLIENT_IMC_DRAM_GT_REQUESTS (0x5040)
+#define PCM_CLIENT_IMC_DRAM_IA_REQUESTS (0x5044)
+#define PCM_CLIENT_IMC_DRAM_IO_REQUESTS (0x5048)
 #define PCM_CLIENT_IMC_DRAM_DATA_READS  (0x5050)
 #define PCM_CLIENT_IMC_DRAM_DATA_WRITES (0x5054)
 #define PCM_CLIENT_IMC_MMAP_SIZE        (0x6000)
@@ -95,9 +97,19 @@ uint64 ClientBW::getImcWrites()
     return mmioRange->read32(PCM_CLIENT_IMC_DRAM_DATA_WRITES - PCM_CLIENT_IMC_EVENT_BASE);
 }
 
+uint64 ClientBW::getGtRequests()
+{
+    return mmioRange->read32(PCM_CLIENT_IMC_DRAM_GT_REQUESTS - PCM_CLIENT_IMC_EVENT_BASE);
+}
+
+uint64 ClientBW::getIaRequests()
+{
+    return mmioRange->read32(PCM_CLIENT_IMC_DRAM_IA_REQUESTS - PCM_CLIENT_IMC_EVENT_BASE);
+}
+
 uint64 ClientBW::getIoRequests()
 {
-    return mmioRange->read32(PCM_CLIENT_IMC_DRAM_IO_REQESTS - PCM_CLIENT_IMC_EVENT_BASE);
+    return mmioRange->read32(PCM_CLIENT_IMC_DRAM_IO_REQUESTS - PCM_CLIENT_IMC_EVENT_BASE);
 }
 
 #define PCM_SERVER_IMC_DRAM_DATA_READS  (0x2290)

bw.h

@@ -32,6 +32,8 @@ namespace pcm {
     public:
         virtual uint64 getImcReads() { return 0; }
         virtual uint64 getImcWrites() { return 0; }
+        virtual uint64 getGtRequests() { return 0; }
+        virtual uint64 getIaRequests() { return 0; }
         virtual uint64 getIoRequests() { return 0; }
         virtual uint64 getPMMReads() { return 0; }
         virtual uint64 getPMMWrites() { return 0; }
@@ -57,6 +59,8 @@ namespace pcm {
 
         uint64 getImcReads() override;
         uint64 getImcWrites() override;
+        uint64 getGtRequests() override;
+        uint64 getIaRequests() override;
         uint64 getIoRequests() override;
     };