From 2d72003b7a3fee448433b15881ab7f2a90f7749f Mon Sep 17 00:00:00 2001 From: AGindinson Date: Tue, 14 Sep 2021 12:01:57 +0300 Subject: [PATCH] Revert "[SYCL][FPGA] Restore legacy debug info version for the hardware (#3991)" The underlying backend is now prepared to accept the ocl-100 version. This reverts commit 33bc8adfe4ec60179df8cdae8ed7de00e7e316e0. --- clang/lib/Driver/ToolChains/Clang.cpp | 6 +----- clang/lib/Driver/ToolChains/SYCL.cpp | 5 +---- clang/test/Driver/sycl-offload.c | 3 +-- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index ad94efe32a520..53c50f67fcabc 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -8723,11 +8723,7 @@ void SPIRVTranslator::ConstructJob(Compilation &C, const JobAction &JA, TranslatorArgs.push_back(Output.getFilename()); if (JA.isDeviceOffloading(Action::OFK_SYCL)) { TranslatorArgs.push_back("-spirv-max-version=1.3"); - // TODO: align debug info for FPGA H/W when its SPIR-V consumer is ready - if (C.getDriver().isFPGAEmulationMode()) - TranslatorArgs.push_back("-spirv-debug-info-version=ocl-100"); - else - TranslatorArgs.push_back("-spirv-debug-info-version=legacy"); + TranslatorArgs.push_back("-spirv-debug-info-version=ocl-100"); // Prevent crash in the translator if input IR contains DIExpression // operations which don't have mapping to OpenCL.DebugInfo.100 spec. TranslatorArgs.push_back("-spirv-allow-extra-diexpressions"); diff --git a/clang/lib/Driver/ToolChains/SYCL.cpp b/clang/lib/Driver/ToolChains/SYCL.cpp index 00c4628824ecc..ae40dc0758d85 100644 --- a/clang/lib/Driver/ToolChains/SYCL.cpp +++ b/clang/lib/Driver/ToolChains/SYCL.cpp @@ -66,10 +66,7 @@ const char *SYCL::Linker::constructLLVMSpirvCommand( } else { CmdArgs.push_back("-spirv-max-version=1.3"); CmdArgs.push_back("-spirv-ext=+all"); - if (!C.getDriver().isFPGAEmulationMode()) - CmdArgs.push_back("-spirv-debug-info-version=legacy"); - else - CmdArgs.push_back("-spirv-debug-info-version=ocl-100"); + CmdArgs.push_back("-spirv-debug-info-version=ocl-100"); CmdArgs.push_back("-spirv-allow-extra-diexpressions"); CmdArgs.push_back("-spirv-allow-unknown-intrinsics=llvm.genx."); CmdArgs.push_back("-o"); diff --git a/clang/test/Driver/sycl-offload.c b/clang/test/Driver/sycl-offload.c index 5d083049d8942..d0d54ddfae900 100644 --- a/clang/test/Driver/sycl-offload.c +++ b/clang/test/Driver/sycl-offload.c @@ -697,8 +697,7 @@ // CHK-TOOLS-AOT: file-table-tform{{.*}} "-extract=Code" "-drop_titles" "-o" "[[OUTPUT2_1:.+\.txt]]" "[[OUTPUT2_T]]" // CHK-TOOLS-CPU: llvm-spirv{{.*}} "-o" "[[OUTPUT3_T:.+\.txt]]" "-spirv-max-version=1.3" "-spirv-debug-info-version=ocl-100" "-spirv-allow-extra-diexpressions" "-spirv-allow-unknown-intrinsics=llvm.genx." {{.*}} "[[OUTPUT2_1]]" // CHK-TOOLS-GEN: llvm-spirv{{.*}} "-o" "[[OUTPUT3_T:.+\.txt]]" "-spirv-max-version=1.3" "-spirv-debug-info-version=ocl-100" "-spirv-allow-extra-diexpressions" "-spirv-allow-unknown-intrinsics=llvm.genx." {{.*}} "[[OUTPUT2_1]]" -// CHK-TOOLS-FPGA-HW: llvm-spirv{{.*}} "-o" "[[OUTPUT3_T:.+\.txt]]" "-spirv-max-version=1.3" "-spirv-debug-info-version=legacy" "-spirv-allow-extra-diexpressions" "-spirv-allow-unknown-intrinsics=llvm.genx." {{.*}} "[[OUTPUT2_1]]" -// CHK-TOOLS-FPGA-EMU: llvm-spirv{{.*}} "-o" "[[OUTPUT3_T:.+\.txt]]" "-spirv-max-version=1.3" "-spirv-debug-info-version=ocl-100" "-spirv-allow-extra-diexpressions" "-spirv-allow-unknown-intrinsics=llvm.genx." {{.*}} "[[OUTPUT2_1]]" +// CHK-TOOLS-FPGA: llvm-spirv{{.*}} "-o" "[[OUTPUT3_T:.+\.txt]]" "-spirv-max-version=1.3" "-spirv-debug-info-version=ocl-100" "-spirv-allow-extra-diexpressions" "-spirv-allow-unknown-intrinsics=llvm.genx." {{.*}} "[[OUTPUT2_1]]" // CHK-TOOLS-FPGA-HW: aoc{{.*}} "-o" "[[OUTPUT4_T:.+\.aocx]]" "[[OUTPUT3_T]]" // CHK-TOOLS-FPGA-EMU: opencl-aot{{.*}} "-spv=[[OUTPUT3_T]]" "-ir=[[OUTPUT4_T:.+\.aocx]]" // CHK-TOOLS-GEN: ocloc{{.*}} "-output" "[[OUTPUT4_T:.+\.out]]" {{.*}} "[[OUTPUT3_T]]"