This is an archive of the discontinued LLVM Phabricator instance.

Differential D63029

[CUDA] Fix grep pattern in cuda-types.cu
ClosedPublic

Authored by hubert.reinterpretcast on Jun 7 2019, 3:05 PM.

Details

Reviewers
jlebar
daltenty
xingxue
jasonliu
tra
Commits
rGa2c2d731db0d: [CUDA] Fix grep pattern in cuda-types.cu
rL362991: [CUDA] Fix grep pattern in cuda-types.cu
rC362991: [CUDA] Fix grep pattern in cuda-types.cu
Summary

vertical-line is not a BRE special character.

POSIX.1-2017 XBD Section 9.3.2 indicates that the interpretation of \| is undefined. This patch uses EREs instead.

Additionally, the pattern is further fixed so that SIZEOF and WIDTH macros are checked.

Diff Detail

Event Timeline

hubert.reinterpretcast created this revision.Jun 7 2019, 3:05 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 7 2019, 3:05 PM
Herald added subscribers: jsji, jfb. · View Herald Transcript
Harbormaster completed remote builds in B33084: Diff 203631.Jun 7 2019, 3:06 PM
tra added a subscriber: tra.Jun 7 2019, 3:11 PM
tra added inline comments.
test/Preprocessor/cuda-types.cu
11

I believe that was a typo in the original test. It should be TYPE|MAX|SIZEOF|WIDTH now.
SIZEOF and WIDTH are parts of different defines we're looking for.

E.g

#define __SIZEOF_DOUBLE__ 8
...
#define __INTPTR_WIDTH__ 32
tra added a reviewer: tra.Jun 7 2019, 3:14 PM
tra removed a subscriber: tra.
hubert.reinterpretcast added inline comments.Jun 7 2019, 3:15 PM
test/Preprocessor/cuda-types.cu
11

I can give that a try. I'll update on the status of whether the test passes once SIZEOF and WIDTH is actually tested.

hubert.reinterpretcast updated this revision to Diff 203659.Jun 7 2019, 6:10 PM

Fix grep pattern in cuda-types.cu

As requested, further fix so that the SIZEOF and WIDTH macros are checked.

Harbormaster completed remote builds in B33096: Diff 203659.Jun 7 2019, 6:11 PM
hubert.reinterpretcast retitled this revision from [NFC][CUDA] Avoid undefined grep in cuda-types.cu to [CUDA] Fix grep pattern in cuda-types.cu.Jun 7 2019, 6:12 PM
hubert.reinterpretcast edited the summary of this revision. (Show Details)
hubert.reinterpretcast marked 3 inline comments as done.
hubert.reinterpretcast added inline comments.
test/Preprocessor/cuda-types.cu
11

The test still passes after updating the pattern to pick up SIZEOF and WIDTH macros. I've updated the patch.

tra accepted this revision.Jun 10 2019, 9:19 AM
This revision is now accepted and ready to land.Jun 10 2019, 9:19 AM
Closed by commit rL362991: [CUDA] Fix grep pattern in cuda-types.cu (authored by hubert.reinterpretcast). · Explain WhyJun 10 2019, 3:26 PM
This revision was automatically updated to reflect the committed changes.
hubert.reinterpretcast marked an inline comment as done.
Herald added a project: Restricted Project. · View Herald TranscriptJun 10 2019, 3:26 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
test/
Preprocessor/
40 lines

Diff 203631

test/Preprocessor/cuda-types.cu

// Check that types, widths, __GCC_ATOMIC* macros, etc. match on the host and // Check that types, widths, __GCC_ATOMIC* macros, etc. match on the host and
// device sides of CUDA compilations. Note that we filter out long double, as // device sides of CUDA compilations. Note that we filter out long double, as
// this is intentionally different on host and device. // this is intentionally different on host and device.
// //
// FIXME: We really should make __GCC_HAVE_SYNC_COMPARE_AND_SWAP identical on // FIXME: We really should make __GCC_HAVE_SYNC_COMPARE_AND_SWAP identical on
// host and device, but architecturally this is difficult at the moment. // host and device, but architecturally this is difficult at the moment.
// RUN: mkdir -p %t // RUN: mkdir -p %t
// RUN: %clang --cuda-host-only -nocudainc -target i386-unknown-linux-gnu -x cuda -E -dM -o - /dev/null \ // RUN: %clang --cuda-host-only -nocudainc -target i386-unknown-linux-gnu -x cuda -E -dM -o - /dev/null \
// RUN: | grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)\|define __GCC_ATOMIC' \ // RUN: | grep -E 'define __[^ ]*(TYPE|MAX|SIZEOF\|WIDTH)|define __GCC_ATOMIC' \
traUnsubmitted
Done
ReplyInline Actions

I believe that was a typo in the original test. It should be TYPE|MAX|SIZEOF|WIDTH now.
SIZEOF and WIDTH are parts of different defines we're looking for.

E.g

#define __SIZEOF_DOUBLE__ 8
...
#define __INTPTR_WIDTH__ 32
tra: I believe that was a typo in the original test. It should be `TYPE|MAX|SIZEOF|WIDTH` now.
hubert.reinterpretcastAuthorUnsubmitted
Done
ReplyInline Actions

I can give that a try. I'll update on the status of whether the test passes once SIZEOF and WIDTH is actually tested.

hubert.reinterpretcast: I can give that a try. I'll update on the status of whether the test passes once `SIZEOF` and…
hubert.reinterpretcastAuthorUnsubmitted
Done
ReplyInline Actions

The test still passes after updating the pattern to pick up SIZEOF and WIDTH macros. I've updated the patch.

hubert.reinterpretcast: The test still passes after updating the pattern to pick up `SIZEOF` and `WIDTH` macros. I've…
// RUN: | grep -v '__LDBL\|_LONG_DOUBLE' > %t/i386-host-defines-filtered // RUN: | grep -Ev '__LDBL|_LONG_DOUBLE' > %t/i386-host-defines-filtered
// RUN: %clang --cuda-device-only -nocudainc -nocudalib -target i386-unknown-linux-gnu -x cuda -E -dM -o - /dev/null \ // RUN: %clang --cuda-device-only -nocudainc -nocudalib -target i386-unknown-linux-gnu -x cuda -E -dM -o - /dev/null \
// RUN: | grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)\|define __GCC_ATOMIC' \ // RUN: | grep -E 'define __[^ ]*(TYPE|MAX|SIZEOF\|WIDTH)|define __GCC_ATOMIC' \
// RUN: | grep -v '__LDBL\|_LONG_DOUBLE' > %t/i386-device-defines-filtered // RUN: | grep -Ev '__LDBL|_LONG_DOUBLE' > %t/i386-device-defines-filtered
// RUN: diff %t/i386-host-defines-filtered %t/i386-device-defines-filtered // RUN: diff %t/i386-host-defines-filtered %t/i386-device-defines-filtered
// RUN: %clang --cuda-host-only -nocudainc -target x86_64-unknown-linux-gnu -x cuda -E -dM -o - /dev/null \ // RUN: %clang --cuda-host-only -nocudainc -target x86_64-unknown-linux-gnu -x cuda -E -dM -o - /dev/null \
// RUN: | grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)\|define __GCC_ATOMIC' \ // RUN: | grep -E 'define __[^ ]*(TYPE|MAX|SIZEOF\|WIDTH)|define __GCC_ATOMIC' \
// RUN: | grep -v '__LDBL\|_LONG_DOUBLE' > %t/x86_64-host-defines-filtered // RUN: | grep -Ev '__LDBL|_LONG_DOUBLE' > %t/x86_64-host-defines-filtered
// RUN: %clang --cuda-device-only -nocudainc -nocudalib -target x86_64-unknown-linux-gnu -x cuda -E -dM -o - /dev/null \ // RUN: %clang --cuda-device-only -nocudainc -nocudalib -target x86_64-unknown-linux-gnu -x cuda -E -dM -o - /dev/null \
// RUN: | grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)\|define __GCC_ATOMIC' \ // RUN: | grep -E 'define __[^ ]*(TYPE|MAX|SIZEOF\|WIDTH)|define __GCC_ATOMIC' \
// RUN: | grep -v '__LDBL\|_LONG_DOUBLE' > %t/x86_64-device-defines-filtered // RUN: | grep -Ev '__LDBL|_LONG_DOUBLE' > %t/x86_64-device-defines-filtered
// RUN: diff %t/x86_64-host-defines-filtered %t/x86_64-device-defines-filtered // RUN: diff %t/x86_64-host-defines-filtered %t/x86_64-device-defines-filtered
// RUN: %clang --cuda-host-only -nocudainc -target powerpc64-unknown-linux-gnu -x cuda -E -dM -o - /dev/null \ // RUN: %clang --cuda-host-only -nocudainc -target powerpc64-unknown-linux-gnu -x cuda -E -dM -o - /dev/null \
// RUN: | grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)\|define __GCC_ATOMIC' \ // RUN: | grep -E 'define __[^ ]*(TYPE|MAX|SIZEOF\|WIDTH)|define __GCC_ATOMIC' \
// RUN: | grep -v '__LDBL\|_LONG_DOUBLE' > %t/powerpc64-host-defines-filtered // RUN: | grep -Ev '__LDBL|_LONG_DOUBLE' > %t/powerpc64-host-defines-filtered
// RUN: %clang --cuda-device-only -nocudainc -nocudalib -target powerpc64-unknown-linux-gnu -x cuda -E -dM -o - /dev/null \ // RUN: %clang --cuda-device-only -nocudainc -nocudalib -target powerpc64-unknown-linux-gnu -x cuda -E -dM -o - /dev/null \
// RUN: | grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)\|define __GCC_ATOMIC' \ // RUN: | grep -E 'define __[^ ]*(TYPE|MAX|SIZEOF\|WIDTH)|define __GCC_ATOMIC' \
// RUN: | grep -v '__LDBL\|_LONG_DOUBLE' > %t/powerpc64-device-defines-filtered // RUN: | grep -Ev '__LDBL|_LONG_DOUBLE' > %t/powerpc64-device-defines-filtered
// RUN: diff %t/powerpc64-host-defines-filtered %t/powerpc64-device-defines-filtered // RUN: diff %t/powerpc64-host-defines-filtered %t/powerpc64-device-defines-filtered
// RUN: %clang --cuda-host-only -nocudainc -target i386-windows-msvc -x cuda -E -dM -o - /dev/null \ // RUN: %clang --cuda-host-only -nocudainc -target i386-windows-msvc -x cuda -E -dM -o - /dev/null \
// RUN: | grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)\|define __GCC_ATOMIC' \ // RUN: | grep -E 'define __[^ ]*(TYPE|MAX|SIZEOF\|WIDTH)|define __GCC_ATOMIC' \
// RUN: | grep -v '__LDBL\|_LONG_DOUBLE' > %t/i386-msvc-host-defines-filtered // RUN: | grep -Ev '__LDBL|_LONG_DOUBLE' > %t/i386-msvc-host-defines-filtered
// RUN: %clang --cuda-device-only -nocudainc -nocudalib -target i386-windows-msvc -x cuda -E -dM -o - /dev/null \ // RUN: %clang --cuda-device-only -nocudainc -nocudalib -target i386-windows-msvc -x cuda -E -dM -o - /dev/null \
// RUN: | grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)\|define __GCC_ATOMIC' \ // RUN: | grep -E 'define __[^ ]*(TYPE|MAX|SIZEOF\|WIDTH)|define __GCC_ATOMIC' \
// RUN: | grep -v '__LDBL\|_LONG_DOUBLE' > %t/i386-msvc-device-defines-filtered // RUN: | grep -Ev '__LDBL|_LONG_DOUBLE' > %t/i386-msvc-device-defines-filtered
// RUN: diff %t/i386-msvc-host-defines-filtered %t/i386-msvc-device-defines-filtered // RUN: diff %t/i386-msvc-host-defines-filtered %t/i386-msvc-device-defines-filtered
// RUN: %clang --cuda-host-only -nocudainc -target x86_64-windows-msvc -x cuda -E -dM -o - /dev/null \ // RUN: %clang --cuda-host-only -nocudainc -target x86_64-windows-msvc -x cuda -E -dM -o - /dev/null \
// RUN: | grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)\|define __GCC_ATOMIC' \ // RUN: | grep -E 'define __[^ ]*(TYPE|MAX|SIZEOF\|WIDTH)|define __GCC_ATOMIC' \
// RUN: | grep -v '__LDBL\|_LONG_DOUBLE' > %t/x86_64-msvc-host-defines-filtered // RUN: | grep -Ev '__LDBL|_LONG_DOUBLE' > %t/x86_64-msvc-host-defines-filtered
// RUN: %clang --cuda-device-only -nocudainc -nocudalib -target x86_64-windows-msvc -x cuda -E -dM -o - /dev/null \ // RUN: %clang --cuda-device-only -nocudainc -nocudalib -target x86_64-windows-msvc -x cuda -E -dM -o - /dev/null \
// RUN: | grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)\|define __GCC_ATOMIC' \ // RUN: | grep -E 'define __[^ ]*(TYPE|MAX|SIZEOF\|WIDTH)|define __GCC_ATOMIC' \
// RUN: | grep -v '__LDBL\|_LONG_DOUBLE' > %t/x86_64-msvc-device-defines-filtered // RUN: | grep -Ev '__LDBL|_LONG_DOUBLE' > %t/x86_64-msvc-device-defines-filtered
// RUN: diff %t/x86_64-msvc-host-defines-filtered %t/x86_64-msvc-device-defines-filtered // RUN: diff %t/x86_64-msvc-host-defines-filtered %t/x86_64-msvc-device-defines-filtered