Merge pull request #21 from caps-tum/develop

Develop
caps-tum · Nov 10, 2023 · f16874b · f16874b
2 parents 5a5d927 + 49c6fdd
commit f16874b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,8 +11,8 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   endif()
 endif()
 
-project(sys-sage VERSION 0.4.2 LANGUAGES C CXX )
-#set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake;${CMAKE_MODULE_PATH}")
+project(sys-sage VERSION 0.4.3 LANGUAGES C CXX )
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
 #### dependencies
 find_package(LibXml2 REQUIRED) # Use pkg-config via the LibXml2 find-module

diff --git a/data-sources/CMakeLists.txt b/data-sources/CMakeLists.txt
@@ -11,7 +11,7 @@ if(DS_HWLOC)
     endif()
 
     add_executable(hwloc-output hwloc-output.cpp)
-    target_link_libraries(hwloc-output HWLOC)
+    target_link_libraries(hwloc-output hwloc)
     install(TARGETS hwloc-output DESTINATION bin)
 endif()
 

diff --git a/data-sources/hwloc-output.cpp b/data-sources/hwloc-output.cpp
@@ -68,7 +68,7 @@ string get_hwloc_topology_xml_string() {
     }
     //TODO replace with hwloc_topology_export_xmlbuffer?
     stringstream xml_output_stream;
-    err = hwloc_topology_export_xml(topology, xml_output_stream, flags);
+    err = hwloc_topology_export_xml(topology, xml_output_stream.str().c_str(), flags);
     if (err) {
         cerr << "hwloc: Failed to export xml" << endl;
         hwloc_topology_destroy(topology);

diff --git a/data-sources/mt4g b/data-sources/mt4g
diff --git a/src/DataPath.cpp b/src/DataPath.cpp
@@ -1,5 +1,8 @@
 #include "DataPath.hpp"
 
+#include <cstdint>
+#include <algorithm>
+
 DataPath* NewDataPath(Component* _source, Component* _target, int _oriented, int _type){
     return NewDataPath(_source,_target,_oriented,_type,(double)-1,(double)-1);
 }

diff --git a/src/xml_dump.cpp b/src/xml_dump.cpp
@@ -1,4 +1,5 @@
 #include <sstream>
+#include <cstdint>
 
 #include "xml_dump.hpp"
 #include <libxml/parser.h>
+3 −0		CMakeLists.txt
+1 −1		README.md
+7 −7		sampleResults/ampere.csv
+6 −6		sampleResults/volta.csv
+1 −1		src/CMakeLists.txt
+11 −11		src/GPU_resources.cuh
+10 −2		src/L2DataCache.cuh
+0 −1		src/LineSize/c15_linesize.cuh
+16 −13		src/LineSize/l2_linesize.cuh
+24 −24		src/ShareChk/chkAllConst.cuh
+24 −24		src/ShareChk/chkAllL1.cuh
+24 −24		src/ShareChk/chkAllRO.cuh
+24 −24		src/ShareChk/chkAllTexture.cuh
+24 −24		src/ShareChk/chkConstShareL1Data.cuh
+24 −24		src/ShareChk/chkL1ShareTexture.cuh
+24 −24		src/ShareChk/chkROShareL1Data.cuh
+24 −24		src/ShareChk/chkROShareTexture.cuh
+24 −24		src/ShareChk/chkTwoC1.cuh
+24 −24		src/ShareChk/chkTwoL1.cuh
+24 −24		src/ShareChk/chkTwoRO.cuh
+24 −24		src/ShareChk/chkTwoTexture.cuh
+0 −118		src/c15_linesize.cuh
+0 −121		src/c1_linesize.cuh
+31 −14		src/capture.cu
+21 −21		src/constCache2.cuh
+10 −11		src/l1.cuh
+10 −11		src/l1LatTest.cuh
+10 −10		src/l2LatTest.cuh
+0 −174		src/l2_linesize.cuh
+178 −0		src/l2_segment_size.cuh
+10 −10		src/mainMemTest.cuh
+11 −11		src/ro.cuh
+12 −12		src/sharedMemTest.cuh
+10 −10		src/starter_other/const15MemTest_sep.cuh
+4 −4		src/starter_other/constL1_5_lat_sep.cuh
+10 −10		src/texture.cuh