[SYCL][Driver][HIP] Do not define __CUDA_ARCH__ for HIP-AMD targets #15443

GeorgeWeb · 2024-09-19T11:49:18Z

Fixes #15544

GeorgeWeb · 2024-10-01T15:17:07Z

Requires #15521 to get merged to rebase on those changes for the sycl-cuda-arch-macro.cpp clang Driver test.

…da-arch

clang/lib/Driver/ToolChains/HIPAMD.cpp

…processor

GeorgeWeb · 2024-10-04T11:31:50Z

clang/lib/Basic/Targets/AMDGPU.cpp

                        Twine("\"") + Twine(CanonName) + Twine("\""));
    Builder.defineMacro("__amdgcn_target_id__",
                        Twine("\"") + Twine(*getTargetID()) + Twine("\""));
-    Builder.defineMacro("__CUDA_ARCH__", "0");


NOTE:
This was previously added to avoid setting it to a non-zero value but is not needed anymore after the changes in this PR completely disable the definition of the macro for SYCL offload. Additionally, the upstream llvm-project doesn't have this line https://github.com/llvm/llvm-project/blob/main/clang/lib/Basic/Targets/AMDGPU.cpp#L311.

clang/test/Driver/sycl-cuda-arch-macro.cpp

elizabethandrews

FE LGTM

…da-arch

GeorgeWeb · 2024-10-08T15:34:04Z

The check-clang failure in sycl-device-traits-macros-amdgcn is from rebase on latest and is fixed in this PR #15633.

Update: Merged latest sycl branch that includes the above fix so all is passing now.

…da-arch

GeorgeWeb · 2024-10-14T14:04:05Z

@intel/llvm-gatekeepers This should be good merge now. Thanks!

sarnex · 2024-10-14T14:05:46Z

@GeorgeWeb The AMD runner is not doing too hot so we won't have E2E HIP testing for a bit (I'm working on it ASAP), are you confident this is sufficiently tested in compile-time tests? Thanks

GeorgeWeb · 2024-10-14T14:17:15Z

@GeorgeWeb The AMD runner is not doing too hot so we won't have E2E HIP testing for a bit (I'm working on it ASAP), are you confident this is sufficiently tested in compile-time tests? Thanks

Good reminder. I forgot that was the reason I didn't ping for merging on Friday. I've run local testing last week but I'd rather it pass the precommit here. It's not a patch of high importance at the moment.

sarnex · 2024-10-14T14:20:34Z

@GeorgeWeb We don't have plans do to HIP testing in precommit for a while because the runner is in such bad shape, but we will have it in post commit when I can fix the runner. If you tested locally and are confident it should work I'm happy to merge the patch and wait and see, just wanted to check your confidence level.

sarnex · 2024-10-17T14:50:31Z

I fixed the HIP AMD runner so I'll merge this now

This commit updates NVIDIA CCCL to version 2.7.0 and starts following the official repository rather than my fork. In order to make this work, I had to incorporate a temporary workaround for intel/llvm#15544 until we start using a release with intel/llvm#15443. Closes acts-project#660.

GeorgeWeb temporarily deployed to WindowsCILock September 19, 2024 11:50 — with GitHub Actions Inactive

GeorgeWeb temporarily deployed to WindowsCILock September 19, 2024 12:36 — with GitHub Actions Inactive

GeorgeWeb mentioned this pull request Sep 30, 2024

[SYCL] Move driver related __CUDA_ARCH__ test to Driver folder from Preprocessor #15521

Merged

Georgi Mirazchiyski added 2 commits October 3, 2024 10:59

[SYCL][Driver][HIP] Do not define __CUDA_ARCH__ for HIP-AMD targets

daa81eb

Add clang Driver test

7062717

GeorgeWeb force-pushed the georgi/hip-undef-cuda-arch branch from 95a29e6 to 7062717 Compare October 3, 2024 10:08

GeorgeWeb had a problem deploying to WindowsCILock October 3, 2024 10:08 — with GitHub Actions Failure

GeorgeWeb marked this pull request as ready for review October 3, 2024 10:09

GeorgeWeb requested review from a team as code owners October 3, 2024 10:09

GeorgeWeb had a problem deploying to WindowsCILock October 3, 2024 10:47 — with GitHub Actions Error

Merge remote-tracking branch 'upstream/sycl' into georgi/hip-undef-cu…

d421f18

…da-arch

GeorgeWeb had a problem deploying to WindowsCILock October 3, 2024 11:17 — with GitHub Actions Error

GeorgeWeb marked this pull request as draft October 3, 2024 11:23

Split NVPTX and AMDGPU filecheck tests

c279604

GeorgeWeb had a problem deploying to WindowsCILock October 3, 2024 11:27 — with GitHub Actions Error

GeorgeWeb had a problem deploying to WindowsCILock October 3, 2024 11:46 — with GitHub Actions Error

GeorgeWeb force-pushed the georgi/hip-undef-cuda-arch branch from 84bff0a to d31852f Compare October 3, 2024 11:49

GeorgeWeb had a problem deploying to WindowsCILock October 3, 2024 11:49 — with GitHub Actions Error

GeorgeWeb force-pushed the georgi/hip-undef-cuda-arch branch from d31852f to 45b86ef Compare October 3, 2024 11:54

GeorgeWeb had a problem deploying to WindowsCILock October 3, 2024 11:55 — with GitHub Actions Error

GeorgeWeb had a problem deploying to WindowsCILock October 3, 2024 12:06 — with GitHub Actions Error

GeorgeWeb temporarily deployed to WindowsCILock October 3, 2024 12:07 — with GitHub Actions Inactive

Georgi Mirazchiyski added 2 commits October 3, 2024 13:14

Do not add fcuda-is-device to CC1 when compiling for HIPAMD

9f8f5e5

Combine the fcuda-is-device test for both triples

34a8d9a

GeorgeWeb temporarily deployed to WindowsCILock October 3, 2024 12:39 — with GitHub Actions Inactive

srividya-sundaram reviewed Oct 3, 2024

View reviewed changes

clang/lib/Driver/ToolChains/HIPAMD.cpp Outdated Show resolved Hide resolved

Restrict fcuda-is-device to NVPTX targets and add a comment

bf72790

GeorgeWeb force-pushed the georgi/hip-undef-cuda-arch branch from 6c5e501 to bf72790 Compare October 4, 2024 10:56

cleanup

6220620

GeorgeWeb had a problem deploying to WindowsCILock October 4, 2024 10:58 — with GitHub Actions Error

Move the check for SYCL restricting adding CUDA_ARCH macro to the pre…

5808cf3

…processor

GeorgeWeb had a problem deploying to WindowsCILock October 4, 2024 11:16 — with GitHub Actions Error

Remove the AMDGPU test for fcuda-is-device

ce47bfc

GeorgeWeb marked this pull request as ready for review October 4, 2024 11:20

GeorgeWeb temporarily deployed to WindowsCILock October 4, 2024 11:20 — with GitHub Actions Inactive

GeorgeWeb commented Oct 4, 2024

View reviewed changes

GeorgeWeb temporarily deployed to WindowsCILock October 4, 2024 12:16 — with GitHub Actions Inactive

srividya-sundaram reviewed Oct 4, 2024

View reviewed changes

clang/test/Driver/sycl-cuda-arch-macro.cpp Show resolved Hide resolved

srividya-sundaram reviewed Oct 4, 2024

View reviewed changes

clang/test/Driver/sycl-cuda-arch-macro.cpp Show resolved Hide resolved

elizabethandrews approved these changes Oct 7, 2024

View reviewed changes

Simplify the CHECK-HIP-NOT sycl-macro test check line

917f3ae

GeorgeWeb had a problem deploying to WindowsCILock October 8, 2024 14:10 — with GitHub Actions Error

Merge remote-tracking branch 'upstream/sycl' into georgi/hip-undef-cu…

e27ee12

…da-arch

GeorgeWeb temporarily deployed to WindowsCILock October 8, 2024 15:10 — with GitHub Actions Inactive

srividya-sundaram approved these changes Oct 8, 2024

View reviewed changes

GeorgeWeb temporarily deployed to WindowsCILock October 9, 2024 12:20 — with GitHub Actions Inactive

Merge remote-tracking branch 'upstream/sycl' into georgi/hip-undef-cu…

7d7b808

…da-arch

GeorgeWeb temporarily deployed to WindowsCILock October 10, 2024 13:18 — with GitHub Actions Inactive

GeorgeWeb temporarily deployed to WindowsCILock October 10, 2024 18:05 — with GitHub Actions Inactive

sarnex merged commit 65e642e into intel:sycl Oct 17, 2024
12 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[SYCL][Driver][HIP] Do not define __CUDA_ARCH__ for HIP-AMD targets #15443

[SYCL][Driver][HIP] Do not define __CUDA_ARCH__ for HIP-AMD targets #15443

Uh oh!

GeorgeWeb commented Sep 19, 2024 •

edited

Loading

Uh oh!

GeorgeWeb commented Oct 1, 2024

Uh oh!

Uh oh!

GeorgeWeb Oct 4, 2024

Uh oh!

Uh oh!

Uh oh!

elizabethandrews left a comment

Uh oh!

GeorgeWeb commented Oct 8, 2024 •

edited

Loading

Uh oh!

GeorgeWeb commented Oct 14, 2024

Uh oh!

sarnex commented Oct 14, 2024

Uh oh!

GeorgeWeb commented Oct 14, 2024 •

edited

Loading

Uh oh!

sarnex commented Oct 14, 2024

Uh oh!

sarnex commented Oct 17, 2024 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

[SYCL][Driver][HIP] Do not define __CUDA_ARCH__ for HIP-AMD targets #15443

[SYCL][Driver][HIP] Do not define __CUDA_ARCH__ for HIP-AMD targets #15443

Uh oh!

Conversation

GeorgeWeb commented Sep 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GeorgeWeb commented Oct 1, 2024

Uh oh!

Uh oh!

GeorgeWeb Oct 4, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

elizabethandrews left a comment

Choose a reason for hiding this comment

Uh oh!

GeorgeWeb commented Oct 8, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GeorgeWeb commented Oct 14, 2024

Uh oh!

sarnex commented Oct 14, 2024

Uh oh!

GeorgeWeb commented Oct 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sarnex commented Oct 14, 2024

Uh oh!

sarnex commented Oct 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

GeorgeWeb commented Sep 19, 2024 •

edited

Loading

GeorgeWeb commented Oct 8, 2024 •

edited

Loading

GeorgeWeb commented Oct 14, 2024 •

edited

Loading

sarnex commented Oct 17, 2024 •

edited

Loading