This is an archive of the discontinued LLVM Phabricator instance.

Differential D109366

[OpenCL] Tests C++ for OpenCL version macros
ClosedPublic

Authored by Topotuna on Sep 7 2021, 8:19 AM.

Details

Reviewers
Anastasia
Commits
rGad88632b6503: [OpenCL] Tests C++ for OpenCL version macros
Summary

Version macro definitions are tested for C++ for OpenCL when
explicit version is provided on command line via -cl-std flag.

Diff Detail

Event Timeline

Topotuna created this revision.Sep 7 2021, 8:19 AM
Herald added subscribers: ldrumm, yaxunl. · View Herald TranscriptSep 7 2021, 8:19 AM
Topotuna requested review of this revision.Sep 7 2021, 8:19 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 7 2021, 8:19 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B122877: Diff 371086.Sep 7 2021, 9:11 AM
Anastasia added inline comments.Sep 9 2021, 3:41 AM
clang/test/Preprocessor/predefined-macros.c
138

I think we should add one extra line with -cl-std=clc++ because this is probably the only way we can test that it now maps to version 1.0.

Topotuna updated this revision to Diff 371544.Sep 9 2021, 3:56 AM
Topotuna retitled this revision from [OpenCL] Tests C++ for OpenCL 2021 version macros to [OpenCL] Tests C++ for OpenCL version macros.
Topotuna edited the summary of this revision. (Show Details)

Test case added for command line flag -cl-std=clc++

Topotuna marked an inline comment as done.Sep 9 2021, 3:56 AM
Harbormaster completed remote builds in B123186: Diff 371544.Sep 9 2021, 4:26 AM
Anastasia added inline comments.Sep 9 2021, 5:41 AM
clang/test/Preprocessor/predefined-macros.c
139

let's just reuse --check-prefix=CHECK-CLCPP10 to avoid duplication. This will always need to map to some other version so it is unlikely we will ever need separate check lines for it.

Topotuna updated this revision to Diff 371831.Sep 10 2021, 2:04 AM

Reuses --check-prefix=CHECK-CLCPP10 for default C++ for OpenCL command line version

Topotuna marked an inline comment as done.Sep 10 2021, 2:04 AM
Harbormaster completed remote builds in B123392: Diff 371831.Sep 10 2021, 3:12 AM
Anastasia accepted this revision.Sep 10 2021, 6:46 AM

LGTM! Thanks

This revision is now accepted and ready to land.Sep 10 2021, 6:46 AM
Closed by commit rGad88632b6503: [OpenCL] Tests C++ for OpenCL version macros (authored by Topotuna). · Explain WhySep 14 2021, 1:49 AM
This revision was automatically updated to reflect the committed changes.
Topotuna added a commit: rGad88632b6503: [OpenCL] Tests C++ for OpenCL version macros.

Revision Contents

PathSize
clang/
test/
Preprocessor/
10 lines

Diff 372435

clang/test/Preprocessor/predefined-macros.c

Show First 20 Lines • Show All 129 Lines • ▼ Show 20 Lines
// RUN: %clang_cc1 %s -E -dM -o - -x cl -cl-std=CL1.2 \ // RUN: %clang_cc1 %s -E -dM -o - -x cl -cl-std=CL1.2 \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-CL12 // RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-CL12
// RUN: %clang_cc1 %s -E -dM -o - -x cl -cl-std=CL2.0 \ // RUN: %clang_cc1 %s -E -dM -o - -x cl -cl-std=CL2.0 \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-CL20 // RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-CL20
// RUN: %clang_cc1 %s -E -dM -o - -x cl -cl-std=CL3.0 \ // RUN: %clang_cc1 %s -E -dM -o - -x cl -cl-std=CL3.0 \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-CL30 // RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-CL30
// RUN: %clang_cc1 %s -E -dM -o - -x cl -cl-fast-relaxed-math \ // RUN: %clang_cc1 %s -E -dM -o - -x cl -cl-fast-relaxed-math \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-FRM // RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-FRM
// RUN: %clang_cc1 %s -E -dM -o - -x cl -cl-std=clc++ \ // RUN: %clang_cc1 %s -E -dM -o - -x cl -cl-std=clc++ \
AnastasiaUnsubmitted
Done
ReplyInline Actions

I think we should add one extra line with -cl-std=clc++ because this is probably the only way we can test that it now maps to version 1.0.

Anastasia: I think we should add one extra line with `-cl-std=clc++` because this is probably the only way…
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-CLCPP10 // RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-CLCPP10
AnastasiaUnsubmitted
Done
ReplyInline Actions

let's just reuse --check-prefix=CHECK-CLCPP10 to avoid duplication. This will always need to map to some other version so it is unlikely we will ever need separate check lines for it.

Anastasia: let's just reuse `--check-prefix=CHECK-CLCPP10` to avoid duplication. This will always need to…
// RUN: %clang_cc1 %s -E -dM -o - -x cl -cl-std=clc++1.0 \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-CLCPP10
// RUN: %clang_cc1 %s -E -dM -o - -x cl -cl-std=clc++2021 \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-CLCPP2021
// CHECK-CL10: #define CL_VERSION_1_0 100 // CHECK-CL10: #define CL_VERSION_1_0 100
// CHECK-CL10: #define CL_VERSION_1_1 110 // CHECK-CL10: #define CL_VERSION_1_1 110
// CHECK-CL10: #define CL_VERSION_1_2 120 // CHECK-CL10: #define CL_VERSION_1_2 120
// CHECK-CL10: #define CL_VERSION_2_0 200 // CHECK-CL10: #define CL_VERSION_2_0 200
// CHECK-CL10: #define CL_VERSION_3_0 300 // CHECK-CL10: #define CL_VERSION_3_0 300
// CHECK-CL10: #define __OPENCL_C_VERSION__ 100 // CHECK-CL10: #define __OPENCL_C_VERSION__ 100
// CHECK-CL10-NOT: #define __FAST_RELAXED_MATH__ 1 // CHECK-CL10-NOT: #define __FAST_RELAXED_MATH__ 1
// CHECK-CL11: #define CL_VERSION_1_0 100 // CHECK-CL11: #define CL_VERSION_1_0 100
Show All 21 Lines
// CHECK-CL30: #define CL_VERSION_1_1 110 // CHECK-CL30: #define CL_VERSION_1_1 110
// CHECK-CL30: #define CL_VERSION_1_2 120 // CHECK-CL30: #define CL_VERSION_1_2 120
// CHECK-CL30: #define CL_VERSION_2_0 200 // CHECK-CL30: #define CL_VERSION_2_0 200
// CHECK-CL30: #define CL_VERSION_3_0 300 // CHECK-CL30: #define CL_VERSION_3_0 300
// CHECK-CL30: #define __OPENCL_C_VERSION__ 300 // CHECK-CL30: #define __OPENCL_C_VERSION__ 300
// CHECK-CL30-NOT: #define __FAST_RELAXED_MATH__ 1 // CHECK-CL30-NOT: #define __FAST_RELAXED_MATH__ 1
// CHECK-FRM: #define __FAST_RELAXED_MATH__ 1 // CHECK-FRM: #define __FAST_RELAXED_MATH__ 1
// CHECK-CLCPP10: #define __CL_CPP_VERSION_1_0__ 100 // CHECK-CLCPP10: #define __CL_CPP_VERSION_1_0__ 100
// CHECK-CLCPP10: #define __CL_CPP_VERSION_2021__ 202100
// CHECK-CLCPP10: #define __OPENCL_CPP_VERSION__ 100 // CHECK-CLCPP10: #define __OPENCL_CPP_VERSION__ 100
// CHECK-CLCPP10-NOT: #define __FAST_RELAXED_MATH__ 1 // CHECK-CLCPP10-NOT: #define __FAST_RELAXED_MATH__ 1
// CHECK-CLCPP10-NOT: #define __ENDIAN_LITTLE__ 1 // CHECK-CLCPP10-NOT: #define __ENDIAN_LITTLE__ 1
// CHECK-CLCPP2021: #define __CL_CPP_VERSION_1_0__ 100
// CHECK-CLCPP2021: #define __CL_CPP_VERSION_2021__ 202100
// CHECK-CLCPP2021: #define __OPENCL_CPP_VERSION__ 202100
// CHECK-CLCPP2021-NOT: #define __FAST_RELAXED_MATH__ 1
// CHECK-CLCPP2021-NOT: #define __ENDIAN_LITTLE__ 1
// RUN: %clang_cc1 %s -E -dM -o - -x cl \ // RUN: %clang_cc1 %s -E -dM -o - -x cl \
// RUN: | FileCheck %s --check-prefix=MSCOPE // RUN: | FileCheck %s --check-prefix=MSCOPE
// MSCOPE:#define __OPENCL_MEMORY_SCOPE_ALL_SVM_DEVICES 3 // MSCOPE:#define __OPENCL_MEMORY_SCOPE_ALL_SVM_DEVICES 3
// MSCOPE:#define __OPENCL_MEMORY_SCOPE_DEVICE 2 // MSCOPE:#define __OPENCL_MEMORY_SCOPE_DEVICE 2
// MSCOPE:#define __OPENCL_MEMORY_SCOPE_SUB_GROUP 4 // MSCOPE:#define __OPENCL_MEMORY_SCOPE_SUB_GROUP 4
// MSCOPE:#define __OPENCL_MEMORY_SCOPE_WORK_GROUP 1 // MSCOPE:#define __OPENCL_MEMORY_SCOPE_WORK_GROUP 1
// MSCOPE:#define __OPENCL_MEMORY_SCOPE_WORK_ITEM 0 // MSCOPE:#define __OPENCL_MEMORY_SCOPE_WORK_ITEM 0
Show All 29 Lines