From b9bf6c1251e8fb1e1bb5361a3fdb25344d8539fe Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 3 Oct 2016 22:49:41 -0400 Subject: [PATCH] P4 to Git Change 1322036 by smekhano@stas-mwamba-rocm on 2016/10/03 22:44:10 SWDEV-104366 - ROCm/LC: allow passing options to llvm through -Wb,... Reviewed by Laurent Morichetti Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/options.cpp#37 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/roccompiler.cpp#22 edit [ROCm/clr commit: 0f7a5d7cd817582cf08974a8c2502ba5c4c70eb7] --- projects/clr/rocclr/compiler/lib/utils/options.cpp | 3 +++ projects/clr/rocclr/runtime/device/rocm/roccompiler.cpp | 2 ++ 2 files changed, 5 insertions(+) diff --git a/projects/clr/rocclr/compiler/lib/utils/options.cpp b/projects/clr/rocclr/compiler/lib/utils/options.cpp index e8d7a892fa..9d05ed4c2f 100644 --- a/projects/clr/rocclr/compiler/lib/utils/options.cpp +++ b/projects/clr/rocclr/compiler/lib/utils/options.cpp @@ -889,6 +889,9 @@ processOption(int OptDescTableIx, Options& Opts, const std::string& Value, } else if (((OptionIdentifier)OptDescTableIx) == OID_WBComma) { Opts.llvmOptions.append(" "); +#if defined(WITH_LIGHTNING_COMPILER) + Opts.llvmOptions.append("-mllvm "); +#endif Opts.llvmOptions.append(sval); } else if (((OptionIdentifier)OptDescTableIx) == OID_WHComma) { diff --git a/projects/clr/rocclr/runtime/device/rocm/roccompiler.cpp b/projects/clr/rocclr/runtime/device/rocm/roccompiler.cpp index 5b253b1b4b..5433a7b817 100644 --- a/projects/clr/rocclr/runtime/device/rocm/roccompiler.cpp +++ b/projects/clr/rocclr/runtime/device/rocm/roccompiler.cpp @@ -156,6 +156,8 @@ HSAILProgram::compileImpl_LC( return false; } + driverOptions.append(options->llvmOptions); + // Set fp32-denormals and fp64-denormals bool fp32Denormals = !options->oVariables->DenormsAreZero && dev().deviceInfo().gfxipVersion_ >= 900;