This is an archive of the discontinued LLVM Phabricator instance.

Differential D156127

Partially revert changes to test lang-std.cpp
ClosedPublic

Authored by yaxunl on Jul 24 2023, 7:22 AM.

Details

Reviewers
probinson
dyung
Summary

Recover the checking for the default language standard for C++.

Diff Detail

Event Timeline

yaxunl created this revision.Jul 24 2023, 7:22 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 24 2023, 7:22 AM
yaxunl requested review of this revision.Jul 24 2023, 7:22 AM
yaxunl mentioned this in D155539: [CUDA][HIP] Use the same default language std as C++.
dyung added a subscriber: dyung.Jul 24 2023, 10:11 AM
dyung added inline comments.
clang/test/Preprocessor/lang-std.cpp
4

This should be unneeded now, we recently updated the PS platforms to default to c++17 like the rest of the compiler in aa34b34e93d444efec6cd894e5e55927d0e413e6
.

yaxunl marked an inline comment as done.Jul 24 2023, 10:53 AM
yaxunl added inline comments.
clang/test/Preprocessor/lang-std.cpp
4

will remove

yaxunl updated this revision to Diff 543640.Jul 24 2023, 10:55 AM
yaxunl marked an inline comment as done.
yaxunl added a reviewer: dyung.

revised by comments

probinson added inline comments.Jul 24 2023, 11:29 AM
clang/test/Preprocessor/lang-std.cpp
4

Use --input-file and there's one fewer process to create.

yaxunl updated this revision to Diff 543670.Jul 24 2023, 12:05 PM

revised by comments

yaxunl updated this revision to Diff 543671.Jul 24 2023, 12:08 PM

fix typo

probinson accepted this revision.Jul 24 2023, 12:26 PM

LGTM

This revision is now accepted and ready to land.Jul 24 2023, 12:26 PM
Harbormaster completed remote builds in B247769: Diff 543671.Jul 24 2023, 9:19 PM
yaxunl closed this revision.Jul 25 2023, 6:46 AM

committed by 19d3b37196553372e963bd70718bba1b0bfc94ee

Revision Contents

PathSize
clang/
test/
Preprocessor/
9 lines

Diff 543671

clang/test/Preprocessor/lang-std.cpp

/// Test default standards. /// Test default standards.
/// CUDA/HIP uses the same default standards as C++.
// RUN: %clang_cc1 -dM -E %s | grep __cplusplus >%T-cpp-std.txt // RUN: %clang_cc1 -dM -E %s | grep __cplusplus >%T-cpp-std.txt
// RUN: %clang_cc1 -dM -E -x cuda %s | grep __cplusplus >%T-cuda-cuda.txt // RUN: FileCheck --input-file %T-cpp-std.txt --check-prefix=CXX17 %s
dyungUnsubmitted
Done
ReplyInline Actions

This should be unneeded now, we recently updated the PS platforms to default to c++17 like the rest of the compiler in aa34b34e93d444efec6cd894e5e55927d0e413e6
.

dyung: This should be unneeded now, we recently updated the PS platforms to default to c++17 like the…
yaxunlAuthorUnsubmitted
Done
ReplyInline Actions

will remove

yaxunl: will remove
probinsonUnsubmitted
Not Done
ReplyInline Actions
// RUN: %clang_cc1 -dM -E %s | grep __cplusplus >%T-cpp-std.txt
- // RUN: cat %T-cpp-std.txt | FileCheck --check-prefix=CXX17 %s
+ // RUN: FileCheck --input-file=%T-cpp-std.txt --check-prefix=CXX17 %s
/// Check that CUDA/HIP uses the same default standards as C++.

Use --input-file and there's one fewer process to create.

probinson: Use `--input-file` and there's one fewer process to create.
/// Check that CUDA/HIP uses the same default standards as C++.
// RUN: %clang_cc1 -dM -E -x cuda %s | grep __cplusplus >%T-cuda-std.txt
// RUN: %clang_cc1 -dM -E -x hip %s | grep __cplusplus >%T-hip-std.txt // RUN: %clang_cc1 -dM -E -x hip %s | grep __cplusplus >%T-hip-std.txt
// RUN: diff %T-cpp-std.txt %T-cuda-cuda.txt // RUN: diff %T-cpp-std.txt %T-cuda-std.txt
// RUN: diff %T-cpp-std.txt %T-hip-std.txt // RUN: diff %T-cpp-std.txt %T-hip-std.txt
// RUN: %clang_cc1 -dM -E -x cuda -std=c++14 %s | FileCheck --check-prefix=CXX14 %s // RUN: %clang_cc1 -dM -E -x cuda -std=c++14 %s | FileCheck --check-prefix=CXX14 %s
// RUN: %clang_cc1 -dM -E -x cuda -std=c++17 %s | FileCheck --check-prefix=CXX17 %s // RUN: %clang_cc1 -dM -E -x cuda -std=c++17 %s | FileCheck --check-prefix=CXX17 %s
// RUN: %clang_cc1 -dM -E -x hip -std=c++98 %s | FileCheck --check-prefix=CXX98 %s // RUN: %clang_cc1 -dM -E -x hip -std=c++98 %s | FileCheck --check-prefix=CXX98 %s
// CXX98: #define __cplusplus 199711L // CXX98: #define __cplusplus 199711L
// CXX14: #define __cplusplus 201402L // CXX14: #define __cplusplus 201402L
// CXX17: #define __cplusplus 201703L // CXX17: #define __cplusplus 201703L