Skip to content

Commit 49b1c1a

Browse files
Make Windows build C++17 compliant (#2833)
Signed-off-by: Anatoly Myachev <[email protected]> Co-authored-by: Victor Perez <[email protected]>
1 parent ee78046 commit 49b1c1a

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ endif()
88

99
include(ExternalProject)
1010

11+
set(CMAKE_CXX_STANDARD 17)
12+
1113
set(CMAKE_INCLUDE_CURRENT_DIR ON)
1214

1315
project(triton CXX C)
@@ -58,15 +60,13 @@ endif()
5860

5961
# Customized release build type with assertions: TritonRelBuildWithAsserts
6062
if(NOT MSVC)
61-
set(CMAKE_CXX_STANDARD 17)
6263
set(CMAKE_C_FLAGS_TRITONRELBUILDWITHASSERTS "-O2 -g")
6364
set(CMAKE_CXX_FLAGS_TRITONRELBUILDWITHASSERTS "-O2 -g")
6465
set(CMAKE_C_FLAGS_TRITONBUILDWITHO1 "-O1")
6566
set(CMAKE_CXX_FLAGS_TRITONBUILDWITHO1 "-O1")
6667
else()
67-
set(CMAKE_CXX_STANDARD 20)
68-
set(CMAKE_C_FLAGS_TRITONRELBUILDWITHASSERTS "/Zi /RTC1 /bigobj /Zc:preprocessor")
69-
set(CMAKE_CXX_FLAGS_TRITONRELBUILDWITHASSERTS "/Zi /RTC1 /bigobj /Zc:preprocessor")
68+
set(CMAKE_C_FLAGS_TRITONRELBUILDWITHASSERTS "/Zi /RTC1 /bigobj /Zc:preprocessor /permissive-")
69+
set(CMAKE_CXX_FLAGS_TRITONRELBUILDWITHASSERTS "/Zi /RTC1 /bigobj /Zc:preprocessor /permissive-")
7070
set(CMAKE_EXE_LINKER_FLAGS_TRITONRELBUILDWITHASSERTS "/debug:fastlink /INCREMENTAL")
7171
set(CMAKE_MODULE_LINKER_FLAGS_TRITONRELBUILDWITHASSERTS "/debug:fastlink /INCREMENTAL")
7272
set(CMAKE_SHARED_LINKER_FLAGS_TRITONRELBUILDWITHASSERTS "/debug:fastlink /INCREMENTAL")

third_party/intel/lib/TritonIntelGPUToLLVM/LoadStoreOpToLLVM.cpp

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,13 @@ getValuesFromBlockPointerStruct(Value blockPointerStruct,
117117
blockPointerStruct.getLoc(), blockPointerStruct, rewriter);
118118
assert(elems.size() == 7 &&
119119
"unexpected number of values unpacked from a block pointer");
120-
BlockPointerValues values{
121-
.base = elems[6],
122-
.baseWidth = elems[3],
123-
.baseHeight = elems[2],
124-
.rowStride = elems[4],
125-
.colStride = elems[5],
126-
.offsetBaseX = elems[1],
127-
.offsetBaseY = elems[0],
128-
};
120+
BlockPointerValues values{/*base=*/elems[6],
121+
/*baseWidth=*/elems[3],
122+
/*baseHeight=*/elems[2],
123+
/*rowStride=*/elems[4],
124+
/*colStride=*/elems[5],
125+
/*offsetBaseX=*/elems[1],
126+
/*offsetBaseY=*/elems[0]};
129127
return values;
130128
}
131129

0 commit comments

Comments
 (0)