Update cmake files with Windows related changes (#5369)

The changes mainly affect compilation options.

Signed-off-by: Anatoly Myachev <[email protected]>

Author: anmyachev

CMakeLists.txt

@@ -58,12 +58,11 @@ if(NOT MSVC)
   set(CMAKE_C_FLAGS_TRITONBUILDWITHO1 "-O1")
   set(CMAKE_CXX_FLAGS_TRITONBUILDWITHO1 "-O1")
 else()
-  set(CMAKE_C_FLAGS_TRITONRELBUILDWITHASSERTS "/Zi /RTC1 /bigobj /Zc:preprocessor")
-  set(CMAKE_CXX_FLAGS_TRITONRELBUILDWITHASSERTS "/Zi /RTC1 /bigobj /Zc:preprocessor")
+  set(CMAKE_C_FLAGS_TRITONRELBUILDWITHASSERTS "/Zi /RTC1 /bigobj /Zc:preprocessor /permissive-")
+  set(CMAKE_CXX_FLAGS_TRITONRELBUILDWITHASSERTS "/Zi /RTC1 /bigobj /Zc:preprocessor /permissive-")
   set(CMAKE_EXE_LINKER_FLAGS_TRITONRELBUILDWITHASSERTS "/debug:fastlink /INCREMENTAL")
   set(CMAKE_MODULE_LINKER_FLAGS_TRITONRELBUILDWITHASSERTS "/debug:fastlink /INCREMENTAL")
   set(CMAKE_SHARED_LINKER_FLAGS_TRITONRELBUILDWITHASSERTS "/debug:fastlink /INCREMENTAL")
-  set(CMAKE_STATIC_LINKER_FLAGS_TRITONRELBUILDWITHASSERTS "/debug:fastlink /INCREMENTAL")
 endif()
 
 # Default build type
@@ -146,7 +145,7 @@ endfunction()
 if(NOT MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-covered-switch-default -fvisibility=hidden")
 else()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX- /wd4244 /wd4624 /wd4715 /wd4530")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4624 /wd4715 /wd4530")
 endif()
 
 include_directories(".")

cmake/AddTritonUnitTest.cmake

@@ -28,7 +28,9 @@ function(add_triton_ut)
           gmock
           ${__LIBS})
 
-  target_compile_options(${__NAME} PRIVATE -fno-rtti)
+  if(NOT MSVC)
+    target_compile_options(${__NAME} PRIVATE -fno-rtti)
+  endif()
 
   target_compile_definitions(${__NAME} PRIVATE ${__DEFS})
 

lib/Instrumentation/CMakeLists.txt

@@ -22,19 +22,21 @@ foreach( plugin ${GPU_INSTRUMENTATION_PASSES} )
       LLVMTransformUtils
       "$<$<PLATFORM_ID:Darwin>:-undefined dynamic_lookup>"
       )
-     # CMAKE_LIBRARY_OUTPUT_DIRECTORY is only set during the Python
-     # build. It is empty if building directly from the root
-     # CMakeLists.txt file. Therefore if not building from Python just
-     # use the default CMake shared lib path otherwise this causes a hard
-     # build error
-     if(DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
-     	set_target_properties(${plugin} PROPERTIES
-     	     LIBRARY_OUTPUT_DIRECTORY
-	     "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../instrumentation")
-     endif(DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+    # CMAKE_LIBRARY_OUTPUT_DIRECTORY is only set during the Python
+    # build. It is empty if building directly from the root
+    # CMakeLists.txt file. Therefore if not building from Python just
+    # use the default CMake shared lib path otherwise this causes a hard
+    # build error
+    if(DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+    set_target_properties(${plugin} PROPERTIES
+          LIBRARY_OUTPUT_DIRECTORY
+      "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../instrumentation")
+    endif(DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
 
-     # This is set to -fvisibility=hidden in the top level CMake file
-     # which causes the llvmGetPassPluginInfo symbol to be hidden and
-     # an "entry point not found" error. Reset it just for this target
-     target_compile_options(${plugin} PRIVATE -fvisibility=default -fno-rtti)
+    # This is set to -fvisibility=hidden in the top level CMake file
+    # which causes the llvmGetPassPluginInfo symbol to be hidden and
+    # an "entry point not found" error. Reset it just for this target
+    if(NOT MSVC)
+      target_compile_options(${plugin} PRIVATE -fvisibility=default -fno-rtti)
+    endif()
 endforeach()

test/lib/Instrumentation/CMakeLists.txt

@@ -20,19 +20,21 @@ foreach( plugin ${GPU_INSTRUMENTATION_PASSES} )
       LLVMCore
       "$<$<PLATFORM_ID:Darwin>:-undefined dynamic_lookup>"
       )
-     # CMAKE_LIBRARY_OUTPUT_DIRECTORY is only set during the Python
-     # build. It is empty if building directly from the root
-     # CMakeLists.txt file. Therefore if not building from Python just
-     # use the default CMake shared lib path otherwise this causes a hard
-     # build error
-     if(DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
-     	set_target_properties(${plugin} PROPERTIES
-     	     LIBRARY_OUTPUT_DIRECTORY
-	     "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../instrumentation")
-     endif(DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+    # CMAKE_LIBRARY_OUTPUT_DIRECTORY is only set during the Python
+    # build. It is empty if building directly from the root
+    # CMakeLists.txt file. Therefore if not building from Python just
+    # use the default CMake shared lib path otherwise this causes a hard
+    # build error
+    if(DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+    set_target_properties(${plugin} PROPERTIES
+          LIBRARY_OUTPUT_DIRECTORY
+      "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../instrumentation")
+    endif(DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
 
-     # This is set to -fvisibility=hidden in the top level CMake file
-     # which causes the llvmGetPassPluginInfo symbol to be hidden and
-     # an "entry point not found" error. Reset it just for this target
-     target_compile_options(${plugin} PRIVATE -fvisibility=default)
+    # This is set to -fvisibility=hidden in the top level CMake file
+    # which causes the llvmGetPassPluginInfo symbol to be hidden and
+    # an "entry point not found" error. Reset it just for this target
+    if(NOT MSVC)
+      target_compile_options(${plugin} PRIVATE -fvisibility=default)
+    endif()
 endforeach()