Skip to content

Make Windows build C++17 compliant #2833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anmyachev merged 11 commits into from
Nov 27, 2024
Merged

Make Windows build C++17 compliant #2833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6f9a0b2
Debug
anmyachev Nov 26, 2024
462bbf9
revert me
anmyachev Nov 26, 2024
dd133c3
fix
anmyachev Nov 26, 2024
ee5829c
use /Zc:lambda compiler option
anmyachev Nov 26, 2024
2c42073
use '/permissive-'
anmyachev Nov 26, 2024
f92a19e
fix: error C7555: use of designated initializers requires at least '/…
anmyachev Nov 26, 2024
eb657bc
Revert "revert me"
anmyachev Nov 26, 2024
9c5d42a
cleanup
anmyachev Nov 26, 2024
23be4ba
Merge branch 'main' into amyachev/win-std
anmyachev Nov 26, 2024
5aaf252
address review comments
anmyachev Nov 26, 2024
3d8eb78
Apply suggestions from code review
anmyachev Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ endif()

include(ExternalProject)

set(CMAKE_CXX_STANDARD 17)

set(CMAKE_INCLUDE_CURRENT_DIR ON)

project(triton CXX C)
Expand Down Expand Up @@ -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-")
Copy link
Copy Markdown
Contributor Author

@anmyachev anmyachev Nov 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ref: https://learn.microsoft.com/en-us/cpp/build/reference/permissive-standards-conformance?view=msvc-170

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")
Expand Down
16 changes: 7 additions & 9 deletions third_party/intel/lib/TritonIntelGPUToLLVM/LoadStoreOpToLLVM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Copy link
Copy Markdown
Contributor Author

@anmyachev anmyachev Nov 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code was according to c++20 standard.

.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;
}

Expand Down