This is an archive of the discontinued LLVM Phabricator instance.

Differential D103221

[CUDA][HIP] Change default lang std to c++14
ClosedPublic

Authored by yaxunl on May 26 2021, 8:18 PM.

Details

Reviewers
tra
Commits
rGf7e87dd6ff0c: [CUDA][HIP] Change default lang std to c++14
Summary

Currently clang and nvcc use c++14 as default std for C++.
gcc 11 even uses c++17 as default std for C++. However,
clang uses c++98 as default std for CUDA/HIP.

As c++14 has been well adopted and became default for
clang, it seems reasonable to use c++14 as default std
for CUDA/HIP.

Diff Detail

Unit TestsFailed

TimeTest
290 msx64 windows > LLVM.DebugInfo/X86::basic-block-sections-debug-loc-const-value-1.ll
240 msx64 windows > LLVM.DebugInfo/X86::basic-block-sections-debug-loc-const-value-2.ll
250 msx64 windows > LLVM.DebugInfo/X86::basic-block-sections-debug-loc-split-range.ll
270 msx64 windows > LLVM.DebugInfo/X86::basic-block-sections-debug-loc.ll
280 msx64 windows > LLVM.DebugInfo/X86::basic-block-sections-debug-loclist-1.ll
View Full Test Results (9 Failed)

Event Timeline

yaxunl created this revision.May 26 2021, 8:18 PM
Herald added a subscriber: dexonsmith. · View Herald TranscriptMay 26 2021, 8:18 PM
yaxunl requested review of this revision.May 26 2021, 8:18 PM
Harbormaster completed remote builds in B106425: Diff 348148.May 26 2021, 9:09 PM
tra accepted this revision.May 27 2021, 10:31 AM
This revision is now accepted and ready to land.May 27 2021, 10:31 AM
tra added inline comments.Jun 1 2021, 8:55 AM
clang/include/clang/Basic/LangStandards.def
196–197

It would make sense to bump C++ version for CUDA as well.

yaxunl updated this revision to Diff 349052.Jun 1 2021, 12:15 PM
yaxunl retitled this revision from [HIP] Change default lang std to c++14 to [CUDA][HIP] Change default lang std to c++14.
yaxunl edited the summary of this revision. (Show Details)

revised by Artem's comments, and fix tests

yaxunl marked an inline comment as done.Jun 1 2021, 12:17 PM
yaxunl added inline comments.
clang/include/clang/Basic/LangStandards.def
196–197

done

tra added inline comments.Jun 1 2021, 12:51 PM
clang/test/SemaCUDA/asm_delayed_diags.cu
31 ↗(On Diff #349052)

Perhaps we should just remove the register.
TBH, I'm not quite sure what this test is supposed to do for NVPTX -- t is not a register class in NVPTX nor does it seem to be a generic constraint.

I guess the idea was that we should ignore asm errors in the host code, while we're compiling for device. In that case, we certainly do not need register

yaxunl updated this revision to Diff 349080.Jun 1 2021, 1:12 PM
yaxunl marked an inline comment as done.

fix test

yaxunl marked an inline comment as done.Jun 1 2021, 1:12 PM
yaxunl added inline comments.
clang/test/SemaCUDA/asm_delayed_diags.cu
31 ↗(On Diff #349052)

removed register.

I think this test is for deferred diags.

tra accepted this revision.Jun 1 2021, 2:26 PM
Harbormaster completed remote builds in B107119: Diff 349080.Jun 1 2021, 2:38 PM
This revision was landed with ongoing or failed builds.Jun 1 2021, 6:09 PM
Closed by commit rGf7e87dd6ff0c: [CUDA][HIP] Change default lang std to c++14 (authored by yaxunl). · Explain Why
This revision was automatically updated to reflect the committed changes.
yaxunl marked an inline comment as done.
yaxunl added a commit: rGf7e87dd6ff0c: [CUDA][HIP] Change default lang std to c++14.
Herald added a project: Restricted Project. · View Herald TranscriptJun 1 2021, 6:09 PM
MaskRay mentioned this in D131465: C++/ObjC++: switch to gnu++17 as the default standard.Aug 8 2022, 10:11 PM
MaskRay mentioned this in rGe321c8dd2cea: C++/ObjC++: switch to gnu++17 as the default standard.Sep 7 2022, 2:18 PM
MaskRay mentioned this in rG3e99b8d947ac: C++/ObjC++: switch to gnu++17 as the default standard.Sep 8 2022, 1:22 AM
scchan mentioned this in D134314: [HIP] stop forcing the lang std in the driver.Sep 20 2022, 2:20 PM
scchan mentioned this in rGcecb0e98d4b1: [HIP] stop forcing the lang std in the driver.Sep 29 2022, 1:22 PM

Revision Contents

PathSize
clang/
include/
clang/
Basic/
2 lines
test/
Preprocessor/
7 lines

Diff 348148

clang/include/clang/Basic/LangStandards.def

Show First 20 Lines • Show All 187 Lines • ▼ Show 20 Lines
LANGSTANDARD_ALIAS_DEPR(opencl10, "CL") LANGSTANDARD_ALIAS_DEPR(opencl10, "CL")
LANGSTANDARD_ALIAS_DEPR(opencl11, "CL1.1") LANGSTANDARD_ALIAS_DEPR(opencl11, "CL1.1")
LANGSTANDARD_ALIAS_DEPR(opencl12, "CL1.2") LANGSTANDARD_ALIAS_DEPR(opencl12, "CL1.2")
LANGSTANDARD_ALIAS_DEPR(opencl20, "CL2.0") LANGSTANDARD_ALIAS_DEPR(opencl20, "CL2.0")
LANGSTANDARD_ALIAS_DEPR(opencl30, "CL3.0") LANGSTANDARD_ALIAS_DEPR(opencl30, "CL3.0")
LANGSTANDARD_ALIAS_DEPR(openclcpp, "CLC++") LANGSTANDARD_ALIAS_DEPR(openclcpp, "CLC++")
// CUDA // CUDA
LANGSTANDARD(cuda, "cuda", CUDA, "NVIDIA CUDA(tm)", LANGSTANDARD(cuda, "cuda", CUDA, "NVIDIA CUDA(tm)",
LineComment | CPlusPlus | Digraphs) LineComment | CPlusPlus | Digraphs)
traUnsubmitted
Done
ReplyInline Actions

It would make sense to bump C++ version for CUDA as well.

tra: It would make sense to bump C++ version for CUDA as well.
yaxunlAuthorUnsubmitted
Done
ReplyInline Actions

done

yaxunl: done
// HIP // HIP
LANGSTANDARD(hip, "hip", HIP, "HIP", LANGSTANDARD(hip, "hip", HIP, "HIP",
LineComment | CPlusPlus | Digraphs) LineComment | CPlusPlus | CPlusPlus11 | CPlusPlus14 | Digraphs)
#undef LANGSTANDARD #undef LANGSTANDARD
#undef LANGSTANDARD_ALIAS #undef LANGSTANDARD_ALIAS
#undef LANGSTANDARD_ALIAS_DEPR #undef LANGSTANDARD_ALIAS_DEPR

clang/test/Preprocessor/lang-std.cu

  • This file was added.
// RUN: %clang_cc1 -dM -E -x hip %s | FileCheck -check-prefix=CXX14 %s
// RUN: %clang_cc1 -dM -E %s | FileCheck -check-prefix=CXX98 %s
// RUN: %clang_cc1 -dM -E -std=c++98 -x hip %s | FileCheck -check-prefix=CXX98 %s
// RUN: %clang_cc1 -dM -E -std=c++14 %s | FileCheck -check-prefix=CXX14 %s
// CXX98: #define __cplusplus 199711L
// CXX14: #define __cplusplus 201402L