[clang] [clang][WebAssembly] Add WebAssembly wasm-opt configuration option (PR #222519)

[via cfe-commits]

llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-clang-driver

Author: Changqing  Jing (Changqing-JING)

<details>
<summary>Changes</summary>

Allow WebAssembly users to customize the wasm-opt stage invoked by Clang, including feature handling and optimization passes

---
Full diff: https://github.com/llvm/llvm-project/pull/222519.diff


3 Files Affected:

- (modified) clang/include/clang/Options/Options.td (+4) 
- (modified) clang/lib/Driver/ToolChains/WebAssembly.cpp (+4) 
- (modified) clang/test/Driver/wasm-toolchain.c (+13) 


``````````diff
diff --git a/clang/include/clang/Options/Options.td b/clang/include/clang/Options/Options.td
index f7e22ee84a9f4..30b2f12ff8c14 100644
--- a/clang/include/clang/Options/Options.td
+++ b/clang/include/clang/Options/Options.td
@@ -6028,6 +6028,10 @@ def mtail_call : Flag<["-"], "mtail-call">, Group<m_wasm_Features_Group>;
 def mno_tail_call : Flag<["-"], "mno-tail-call">, Group<m_wasm_Features_Group>;
 def mwide_arithmetic : Flag<["-"], "mwide-arithmetic">, Group<m_wasm_Features_Group>;
 def mno_wide_arithmetic : Flag<["-"], "mno-wide-arithmetic">, Group<m_wasm_Features_Group>;
+def mwasm_opt_args_EQ : Joined<["-"], "mwasm-opt-args=">,
+  Group<m_wasm_Features_Driver_Group>,
+  HelpText<"Pass <arg> to wasm-opt (WebAssembly only); may be specified multiple times">,
+  MetaVarName<"<arg>">;
 def mexec_model_EQ : Joined<["-"], "mexec-model=">, Group<m_wasm_Features_Driver_Group>,
                      Values<"command,reactor">,
                      HelpText<"Execution model (WebAssembly only)">,
diff --git a/clang/lib/Driver/ToolChains/WebAssembly.cpp b/clang/lib/Driver/ToolChains/WebAssembly.cpp
index 7d5d406df2399..7977023fa61d3 100644
--- a/clang/lib/Driver/ToolChains/WebAssembly.cpp
+++ b/clang/lib/Driver/ToolChains/WebAssembly.cpp
@@ -224,6 +224,9 @@ void wasm::Linker::ConstructJob(Compilation &C, const JobAction &JA,
     }
   }
 
+  ArgStringList WasmOptUserArgs;
+  Args.AddAllArgValues(WasmOptUserArgs, options::OPT_mwasm_opt_args_EQ);
+
   if (!WasmOptPath.empty()) {
     CmdArgs.push_back("--keep-section=target_features");
   }
@@ -248,6 +251,7 @@ void wasm::Linker::ConstructJob(Compilation &C, const JobAction &JA,
         ArgStringList OptArgs;
         OptArgs.push_back(Output.getFilename());
         OptArgs.push_back(Args.MakeArgString(llvm::Twine("-O") + OOpt));
+        OptArgs.append(WasmOptUserArgs.begin(), WasmOptUserArgs.end());
         OptArgs.push_back("-o");
         OptArgs.push_back(Output.getFilename());
         C.addCommand(std::make_unique<Command>(
diff --git a/clang/test/Driver/wasm-toolchain.c b/clang/test/Driver/wasm-toolchain.c
index 467d79e57aff1..9e6e6e9c04d1b 100644
--- a/clang/test/Driver/wasm-toolchain.c
+++ b/clang/test/Driver/wasm-toolchain.c
@@ -30,6 +30,19 @@
 // LINK_OPT: "-cc1" {{.*}} "-o" "[[temp:[^"]*]]"
 // LINK_OPT: wasm-ld{{.*}}" "-L/foo/lib" "crt1.o" "[[temp]]" "-lc" "{{.*[/\\]}}libclang_rt.builtins.a" "-o" "a.out"
 
+// -mwasm-opt-args= passes arguments to wasm-opt without passing them to wasm-ld.
+// UNSUPPORTED: system-windows
+// RUN: rm -rf %t-wasm-opt
+// RUN: mkdir -p %t-wasm-opt/bin
+// RUN: ln -s %clang %t-wasm-opt/bin/wasm-opt
+// RUN: %clang -### -O2 --target=wasm32-unknown-unknown --sysroot=/foo \
+// RUN:   -B%t-wasm-opt/bin %s -mwasm-opt-args=--disable-bulk-memory \
+// RUN:   -mwasm-opt-args=--converge 2>&1 \
+// RUN:   | FileCheck -check-prefix=WASM_OPT_ARGS %s
+// WASM_OPT_ARGS: wasm-ld{{.*}}" "-L/foo/lib" "crt1.o" {{.*}} "-o" "a.out"
+// WASM_OPT_ARGS-NOT: "--disable-bulk-memory"
+// WASM_OPT_ARGS: wasm-opt{{.*}}" "a.out" "-O2" "--disable-bulk-memory" "--converge" "-o" "a.out"
+
 // A basic C link command-line with known OS.
 
 // RUN: %clang -### --target=wasm32-wasi --sysroot=/foo %s 2>&1 \

``````````

</details>


https://github.com/llvm/llvm-project/pull/222519