diff --git a/CMakeLists.txt b/CMakeLists.txt index a1a2c4c117..5b9cdd0bda 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,8 @@ endif() include(ExternalProject) +set(CMAKE_CXX_STANDARD 17) + set(CMAKE_INCLUDE_CURRENT_DIR ON) project(triton CXX C) @@ -58,15 +60,13 @@ endif() # Customized release build type with assertions: TritonRelBuildWithAsserts if(NOT MSVC) - set(CMAKE_CXX_STANDARD 17) set(CMAKE_C_FLAGS_TRITONRELBUILDWITHASSERTS "-O2 -g") set(CMAKE_CXX_FLAGS_TRITONRELBUILDWITHASSERTS "-O2 -g") set(CMAKE_C_FLAGS_TRITONBUILDWITHO1 "-O1") set(CMAKE_CXX_FLAGS_TRITONBUILDWITHO1 "-O1") else() - set(CMAKE_CXX_STANDARD 20) - 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") diff --git a/third_party/intel/lib/TritonIntelGPUToLLVM/LoadStoreOpToLLVM.cpp b/third_party/intel/lib/TritonIntelGPUToLLVM/LoadStoreOpToLLVM.cpp index 6604e2e8db..74576da2f2 100644 --- a/third_party/intel/lib/TritonIntelGPUToLLVM/LoadStoreOpToLLVM.cpp +++ b/third_party/intel/lib/TritonIntelGPUToLLVM/LoadStoreOpToLLVM.cpp @@ -117,15 +117,13 @@ getValuesFromBlockPointerStruct(Value blockPointerStruct, blockPointerStruct.getLoc(), blockPointerStruct, rewriter); assert(elems.size() == 7 && "unexpected number of values unpacked from a block pointer"); - BlockPointerValues values{ - .base = elems[6], - .baseWidth = elems[3], - .baseHeight = elems[2], - .rowStride = elems[4], - .colStride = elems[5], - .offsetBaseX = elems[1], - .offsetBaseY = elems[0], - }; + BlockPointerValues values{/*base=*/elems[6], + /*baseWidth=*/elems[3], + /*baseHeight=*/elems[2], + /*rowStride=*/elems[4], + /*colStride=*/elems[5], + /*offsetBaseX=*/elems[1], + /*offsetBaseY=*/elems[0]}; return values; }