From cb2f340850db007aebf5012858697ba5afc1ce4e Mon Sep 17 00:00:00 2001 From: Joseph Huber Date: Thu, 18 Jan 2024 10:50:08 -0600 Subject: [PATCH] [CUDA] Disable registering surfaces and textures with the new driver Summary: These runtime calls don't seem to be supported anymore, disable them for now. --- clang/test/Driver/linker-wrapper-image.c | 2 -- clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/clang/test/Driver/linker-wrapper-image.c b/clang/test/Driver/linker-wrapper-image.c index 147d315f8e39..fa2e59e36b38 100644 --- a/clang/test/Driver/linker-wrapper-image.c +++ b/clang/test/Driver/linker-wrapper-image.c @@ -121,11 +121,9 @@ // CUDA-NEXT: br label %if.end // CUDA: sw.surface: -// CUDA-NEXT: call void @__cudaRegisterSurface(ptr %0, ptr %addr, ptr %name, ptr %name, i32 %textype, i32 %extern) // CUDA-NEXT: br label %if.end // CUDA: sw.texture: -// CUDA-NEXT: call void @__cudaRegisterTexture(ptr %0, ptr %addr, ptr %name, ptr %name, i32 %textype, i32 %normalized, i32 %extern) // CUDA-NEXT: br label %if.end // CUDA: if.end: diff --git a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp index bfb54f58330b..5485a4b74bf8 100644 --- a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp +++ b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp @@ -916,7 +916,8 @@ wrapDeviceImages(ArrayRef> Buffers, case OFK_Cuda: if (Error Err = offloading::wrapCudaBinary( M, BuffersToWrap.front(), - offloading::getOffloadEntryArray(M, "cuda_offloading_entries"))) + offloading::getOffloadEntryArray(M, "cuda_offloading_entries"), + /*Suffix=*/"", /*EmitSurfacesAndTextures=*/false)) return std::move(Err); break; case OFK_HIP: