Debugging perfetto support with nvhpc

UO-OACISS · Jan 3, 2023 · 420dcc4 · 420dcc4
1 parent b0a921e
commit 420dcc4
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/src/apex/CMakeLists.hpx b/src/apex/CMakeLists.hpx
@@ -338,6 +338,9 @@ set(apex_sources
     gzstream.cpp
     handler.cpp
     memory_wrapper.cpp
+    ${APEX_SOURCE_DIR}/src/perfetto_sdk/perfetto.cc
+    perfetto_listener.cpp
+    perfetto_static.cpp
     policy_handler.cpp
     profile_reducer.cpp
     profiler_listener.cpp
@@ -361,6 +364,22 @@ set(apex_sources
 
 include(GNUInstallDirs)
 
+if (WIN32)
+# Enable standards-compliant mode when using the Visual Studio compiler.
+    if (MSVC)
+        SET_SOURCE_FILES_PROPERTIES( perfetto.cc PROPERTIES COMPILE_FLAGS
+            "/permissive- /bigobj -DWIN32_LEAN_AND_MEAN -DNOMINMAX" )
+    else (MSVC)
+        SET_SOURCE_FILES_PROPERTIES( perfetto.cc PROPERTIES COMPILE_FLAGS
+            "/bigobj -DWIN32_LEAN_AND_MEAN -DNOMINMAX" )
+    endif (MSVC)
+endif (WIN32)
+
+# Force C++11 with NVHPC, it crashes otherwise
+if (CMAKE_CXX_COMPILER_ID MATCHES NVHPC)
+    set(CMAKE_CXX_STANDARD 11)
+endif()
+
 # APEX has one dependency in HPX, just the main library.
 # Unless HPXMP is also used.
 
@@ -379,6 +398,7 @@ target_include_directories(apex PUBLIC
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${APEX_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
+    $<BUILD_INTERFACE:${APEX_SOURCE_DIR}/src/perfetto_sdk>
     $<INSTALL_INTERFACE:include>)
 
 # To have the compile options and definitions

diff --git a/src/perfetto_sdk/CMakeLists.txt b/src/perfetto_sdk/CMakeLists.txt
@@ -1,4 +1,8 @@
 include_directories(${APEX_SOURCE_DIR}/src/perfetto_sdk)
+# Force C++11 with NVHPC, it crashes otherwise
+if (CMAKE_CXX_COMPILER_ID MATCHES NVHPC)
+    set(CMAKE_CXX_STANDARD 11)
+endif()
 add_library (perfetto perfetto.cc)
 
 if (WIN32)

diff --git a/src/perfetto_sdk/perfetto.cc b/src/perfetto_sdk/perfetto.cc
@@ -1,3 +1,6 @@
+#ifdef __NVCOMPILER
+#warning "nvc++ takes a long time to compile this file..."
+#endif
 // Copyright (C) 2019 The Android Open Source Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/perfetto_sdk/perfetto.h b/src/perfetto_sdk/perfetto.h
@@ -99,7 +99,7 @@ enum class BufferExhaustedPolicy {
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_FORCE_DLOG_OFF() (0)
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_FORCE_DCHECK_ON() (0)
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_FORCE_DCHECK_OFF() (0)
-#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_VERBOSE_LOGS() (1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_VERBOSE_LOGS() (0)
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_VERSION_GEN() (1)
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_PERCENTILE() (0)
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_LINENOISE() (0)