Merge pull request #114 from opcm/push_201901

Push 201901
intel · Jan 31, 2019 · bf28a6a · bf28a6a
2 parents 86d7d99 + 741a3e4
commit bf28a6a
Show file tree

Hide file tree

Showing 46 changed files with 1,795 additions and 1,175 deletions.
diff --git a/Makefile b/Makefile
@@ -49,7 +49,7 @@ LIB= -lpthread -lc++
 CXXFLAGS += -std=c++11
 endif
 
-COMMON_OBJS = msr.o cpucounters.o pci.o client_bw.o utils.o
+COMMON_OBJS = msr.o cpucounters.o pci.o mmio.o client_bw.o utils.o
 EXE_OBJS = $(EXE:.x=.o)
 OBJS = $(COMMON_OBJS) $(EXE_OBJS)
 
@@ -80,6 +80,9 @@ libPCM.a: $(COMMON_OBJS)
 	  sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
 	@rm -f $*.d.tmp
 
+memoptest.x: memoptest.cpp
+	g++ -Wall -g -O0 -std=c++11    memoptest.cpp   -o memoptest.x
+
 nice:
 	uncrustify --replace -c ~/uncrustify.cfg *.cpp *.h WinMSRDriver/Win7/*.h WinMSRDriver/Win7/*.c WinMSRDriver/WinXP/*.h WinMSRDriver/WinXP/*.c  PCM_Win/*.h PCM_Win/*.cpp  
 

diff --git a/PCM-Core_Win/pcm-core-win.vcxproj b/PCM-Core_Win/pcm-core-win.vcxproj
@@ -155,7 +155,7 @@
     <ClCompile Include="..\msr.cpp" />
     <ClCompile Include="..\pci.cpp" />
     <ClCompile Include="..\winpmem\winpmem.cpp" />
-    <ClCompile Include="..\client_bw.cpp" />
+    <ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
     <ClCompile Include="..\freegetopt\getopt.cpp" />
     <ClCompile Include="pcm-core-win.cpp" />
     <ClCompile Include="stdafx.cpp" />
@@ -169,7 +169,7 @@
     <ClInclude Include="..\cpucounters.h" />
     <ClInclude Include="..\msr.h" />
     <ClInclude Include="..\pci.h" />
-    <ClInclude Include="..\client_bw.h" />
+    <ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="..\types.h" />
     <ClInclude Include="windriver.h" />

diff --git a/PCM-IIO_Win/pcm-iio-win.vcxproj b/PCM-IIO_Win/pcm-iio-win.vcxproj
@@ -155,7 +155,7 @@
     <ClCompile Include="..\msr.cpp" />
     <ClCompile Include="..\pci.cpp" />
     <ClCompile Include="..\winpmem\winpmem.cpp" />
-    <ClCompile Include="..\client_bw.cpp" />
+    <ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
     <ClCompile Include="..\freegetopt\getopt.cpp" />
     <ClCompile Include="pcm-iio-win.cpp" />
     <ClCompile Include="stdafx.cpp" />
@@ -169,7 +169,7 @@
     <ClInclude Include="..\cpucounters.h" />
     <ClInclude Include="..\msr.h" />
     <ClInclude Include="..\pci.h" />
-    <ClInclude Include="..\client_bw.h" />
+    <ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="..\types.h" />
     <ClInclude Include="windriver.h" />

diff --git a/PCM-LSPCI_Win/pcm-lspci-win.vcxproj b/PCM-LSPCI_Win/pcm-lspci-win.vcxproj
@@ -155,7 +155,7 @@
     <ClCompile Include="..\msr.cpp" />
     <ClCompile Include="..\pci.cpp" />
     <ClCompile Include="..\winpmem\winpmem.cpp" />
-    <ClCompile Include="..\client_bw.cpp" />
+    <ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
     <ClCompile Include="..\freegetopt\getopt.cpp" />
     <ClCompile Include="pcm-lspci-win.cpp" />
     <ClCompile Include="stdafx.cpp" />
@@ -169,7 +169,7 @@
     <ClInclude Include="..\cpucounters.h" />
     <ClInclude Include="..\msr.h" />
     <ClInclude Include="..\pci.h" />
-    <ClInclude Include="..\client_bw.h" />
+    <ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="..\types.h" />
     <ClInclude Include="windriver.h" />

diff --git a/PCM-Latency_Win/pcm-latency-win.vcxproj b/PCM-Latency_Win/pcm-latency-win.vcxproj
@@ -155,7 +155,7 @@
     <ClCompile Include="..\msr.cpp" />
     <ClCompile Include="..\pci.cpp" />
     <ClCompile Include="..\winpmem\winpmem.cpp" />
-    <ClCompile Include="..\client_bw.cpp" />
+    <ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
     <ClCompile Include="..\freegetopt\getopt.cpp" />
     <ClCompile Include="pcm-latency-win.cpp" />
     <ClCompile Include="stdafx.cpp" />
@@ -169,7 +169,7 @@
     <ClInclude Include="..\cpucounters.h" />
     <ClInclude Include="..\msr.h" />
     <ClInclude Include="..\pci.h" />
-    <ClInclude Include="..\client_bw.h" />
+    <ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="..\types.h" />
     <ClInclude Include="windriver.h" />

diff --git a/PCM-Lib_Win/pcm-lib.vcxproj b/PCM-Lib_Win/pcm-lib.vcxproj
@@ -190,7 +190,7 @@
     <ClCompile Include="..\winpmem\winpmem.cpp" />
     <ClCompile Include="..\msr.cpp" />
     <ClCompile Include="..\pci.cpp" />
-    <ClCompile Include="..\client_bw.cpp" />
+    <ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
     <ClCompile Include="..\utils.cpp" />
     <ClCompile Include="..\PCM_Win\restrictDriverAccess.cpp">
       <CompileAsManaged>true</CompileAsManaged>
@@ -202,7 +202,7 @@
     <ClInclude Include="pcm-lib.h" />
     <ClInclude Include="..\msr.h" />
     <ClInclude Include="..\pci.h" />
-    <ClInclude Include="..\client_bw.h" />
+    <ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
     <ClInclude Include="targetver.h" />
   </ItemGroup>
   <ItemGroup>

diff --git a/PCM-MSR_Win/pcm-msr-win.vcxproj b/PCM-MSR_Win/pcm-msr-win.vcxproj
@@ -154,7 +154,7 @@
     <ClCompile Include="..\cpucounters.cpp" />
     <ClCompile Include="..\msr.cpp" />
     <ClCompile Include="..\pci.cpp" />
-    <ClCompile Include="..\client_bw.cpp" />
+    <ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
     <ClCompile Include="..\freegetopt\getopt.cpp" />
     <ClCompile Include="pcm-msr-win.cpp" />
     <ClCompile Include="..\winpmem\winpmem.cpp" />
@@ -169,7 +169,7 @@
     <ClInclude Include="..\cpucounters.h" />
     <ClInclude Include="..\msr.h" />
     <ClInclude Include="..\pci.h" />
-    <ClInclude Include="..\client_bw.h" />
+    <ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="..\types.h" />
     <ClInclude Include="windriver.h" />

diff --git a/PCM-Memory_Win/pcm-memory-win.vcxproj b/PCM-Memory_Win/pcm-memory-win.vcxproj
@@ -154,7 +154,7 @@
     <ClCompile Include="..\cpucounters.cpp" />
     <ClCompile Include="..\msr.cpp" />
     <ClCompile Include="..\pci.cpp" />
-    <ClCompile Include="..\client_bw.cpp" />
+    <ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
     <ClCompile Include="..\freegetopt\getopt.cpp" />
     <ClCompile Include="pcm-memory-win.cpp" />
     <ClCompile Include="..\winpmem\winpmem.cpp" />
@@ -169,7 +169,7 @@
     <ClInclude Include="..\cpucounters.h" />
     <ClInclude Include="..\msr.h" />
     <ClInclude Include="..\pci.h" />
-    <ClInclude Include="..\client_bw.h" />
+    <ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="..\types.h" />
     <ClInclude Include="windriver.h" />

diff --git a/PCM-NUMA_Win/pcm-numa-win.vcxproj b/PCM-NUMA_Win/pcm-numa-win.vcxproj
@@ -154,7 +154,7 @@
     <ClCompile Include="..\cpucounters.cpp" />
     <ClCompile Include="..\msr.cpp" />
     <ClCompile Include="..\pci.cpp" />
-    <ClCompile Include="..\client_bw.cpp" />
+    <ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
     <ClCompile Include="..\freegetopt\getopt.cpp" />
     <ClCompile Include="pcm-numa-win.cpp" />
     <ClCompile Include="..\winpmem\winpmem.cpp" />
@@ -169,7 +169,7 @@
     <ClInclude Include="..\cpucounters.h" />
     <ClInclude Include="..\msr.h" />
     <ClInclude Include="..\pci.h" />
-    <ClInclude Include="..\client_bw.h" />
+    <ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="..\types.h" />
     <ClInclude Include="windriver.h" />

diff --git a/PCM-PCICFG_Win/pcm-pcicfg-win.vcxproj b/PCM-PCICFG_Win/pcm-pcicfg-win.vcxproj
@@ -155,7 +155,7 @@
     <ClCompile Include="..\msr.cpp" />
     <ClCompile Include="..\pci.cpp" />
     <ClCompile Include="..\winpmem\winpmem.cpp" />
-    <ClCompile Include="..\client_bw.cpp" />
+    <ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
     <ClCompile Include="..\freegetopt\getopt.cpp" />
     <ClCompile Include="pcm-pcicfg-win.cpp" />
     <ClCompile Include="stdafx.cpp" />
@@ -169,7 +169,7 @@
     <ClInclude Include="..\cpucounters.h" />
     <ClInclude Include="..\msr.h" />
     <ClInclude Include="..\pci.h" />
-    <ClInclude Include="..\client_bw.h" />
+    <ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="..\types.h" />
     <ClInclude Include="windriver.h" />

diff --git a/PCM-PCIE_Win/pcm-pcie-win.vcxproj b/PCM-PCIE_Win/pcm-pcie-win.vcxproj
@@ -154,7 +154,7 @@
     <ClCompile Include="..\cpucounters.cpp" />
     <ClCompile Include="..\msr.cpp" />
     <ClCompile Include="..\pci.cpp" />
-    <ClCompile Include="..\client_bw.cpp" />
+    <ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
     <ClCompile Include="..\freegetopt\getopt.cpp" />
     <ClCompile Include="pcm-pcie-win.cpp" />
     <ClCompile Include="..\winpmem\winpmem.cpp" />
@@ -169,7 +169,7 @@
     <ClInclude Include="..\cpucounters.h" />
     <ClInclude Include="..\msr.h" />
     <ClInclude Include="..\pci.h" />
-    <ClInclude Include="..\client_bw.h" />
+    <ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="..\types.h" />
     <ClInclude Include="windriver.h" />

diff --git a/PCM-Power_Win/pcm-power-win.vcxproj b/PCM-Power_Win/pcm-power-win.vcxproj
@@ -155,7 +155,7 @@
     <ClCompile Include="..\msr.cpp" />
     <ClCompile Include="..\pci.cpp" />
     <ClCompile Include="..\winpmem\winpmem.cpp" />
-    <ClCompile Include="..\client_bw.cpp" />
+    <ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
     <ClCompile Include="..\freegetopt\getopt.cpp" />
     <ClCompile Include="pcm-power-win.cpp" />
     <ClCompile Include="stdafx.cpp" />
@@ -169,7 +169,7 @@
     <ClInclude Include="..\cpucounters.h" />
     <ClInclude Include="..\msr.h" />
     <ClInclude Include="..\pci.h" />
-    <ClInclude Include="..\client_bw.h" />
+    <ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="..\types.h" />
     <ClInclude Include="windriver.h" />

diff --git a/PCM-TSX_Win/pcm-tsx-win.vcxproj b/PCM-TSX_Win/pcm-tsx-win.vcxproj
@@ -154,7 +154,7 @@
     <ClCompile Include="..\cpucounters.cpp" />
     <ClCompile Include="..\msr.cpp" />
     <ClCompile Include="..\pci.cpp" />
-    <ClCompile Include="..\client_bw.cpp" />
+    <ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
     <ClCompile Include="..\freegetopt\getopt.cpp" />
     <ClCompile Include="pcm-tsx-win.cpp" />
     <ClCompile Include="..\winpmem\winpmem.cpp" />
@@ -169,7 +169,7 @@
     <ClInclude Include="..\cpucounters.h" />
     <ClInclude Include="..\msr.h" />
     <ClInclude Include="..\pci.h" />
-    <ClInclude Include="..\client_bw.h" />
+    <ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="..\types.h" />
     <ClInclude Include="windriver.h" />

diff --git a/PCM_Win/pcm.vcxproj b/PCM_Win/pcm.vcxproj
@@ -155,7 +155,7 @@
     <ClCompile Include="..\winpmem\winpmem.cpp" />
     <ClCompile Include="..\msr.cpp" />
     <ClCompile Include="..\pci.cpp" />
-    <ClCompile Include="..\client_bw.cpp" />
+    <ClCompile Include="..\client_bw.cpp" /> <ClCompile Include="..\mmio.cpp" />
     <ClCompile Include="pcm.cpp" />
     <ClCompile Include="restrictDriverAccess.cpp">
       <CompileAsManaged>true</CompileAsManaged>
@@ -168,7 +168,7 @@
     <ClInclude Include="..\cpucounters.h" />
     <ClInclude Include="..\msr.h" />
     <ClInclude Include="..\pci.h" />
-    <ClInclude Include="..\client_bw.h" />
+    <ClInclude Include="..\client_bw.h" /> <ClInclude Include="..\mmio.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="..\types.h" />
     <ClInclude Include="windriver.h" />

diff --git a/WinMSRDriver/Win7/msrmain.c b/WinMSRDriver/Win7/msrmain.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2012, Intel Corporation
+Copyright (c) 2009-2018, Intel Corporation
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: