Skip to content

[wasm-split] Set import namespace only when given in multi-split #7966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aheejin merged 3 commits into from
Oct 11, 2025
+33 −28
Merged

[wasm-split] Set import namespace only when given in multi-split #7966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
361ebca
[wasm-split] Set import namespace only when given in multi-split
aheejin Oct 11, 2025
7cd7427
Update multi-split-escape-names.wast
aheejin Oct 11, 2025
c93bf81
Update help test
aheejin Oct 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/tools/wasm-split/split-options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ WasmSplitOptions::WasmSplitOptions()
"module into the secondary module. In instrument mode, refers to the "
"namespace from which to import the secondary memory, if any.",
WasmSplitOption,
{Mode::Split, Mode::Instrument, Mode::MultiSplit},
{Mode::Split, Mode::MultiSplit, Mode::Instrument},
Copy link
Copy Markdown
Member Author

@aheejin aheejin Oct 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This just changed the order

Options::Arguments::One,
[&](Options* o, const std::string& argument) {
importNamespace = argument;
Expand Down
21 changes: 13 additions & 8 deletions src/tools/wasm-split/wasm-split.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,16 @@ void writePlaceholderMap(
}
}

void setCommonSplitConfigs(ModuleSplitting::Config& config,
const WasmSplitOptions& options) {
config.usePlaceholders = options.usePlaceholders;
config.minimizeNewExportNames = !options.passOptions.debugInfo;
if (options.importNamespace.size()) {
config.importNamespace = options.importNamespace;
}
// TODO Add more configs here
}

void splitModule(const WasmSplitOptions& options) {
Module wasm;
parseInput(wasm, options);
Expand Down Expand Up @@ -329,18 +339,14 @@ void splitModule(const WasmSplitOptions& options) {

// Actually perform the splitting
ModuleSplitting::Config config;
setCommonSplitConfigs(config, options);
config.secondaryFuncs.push_back(std::move(splitFuncs));
if (options.importNamespace.size()) {
config.importNamespace = options.importNamespace;
}
if (options.placeholderNamespace.size()) {
config.placeholderNamespace = options.placeholderNamespace;
}
if (options.exportPrefix.size()) {
config.newExportPrefix = options.exportPrefix;
}
config.usePlaceholders = options.usePlaceholders;
config.minimizeNewExportNames = !options.passOptions.debugInfo;
config.jspi = options.jspi;
auto splitResults = ModuleSplitting::splitFunctions(wasm, config);
auto& secondary = *splitResults.secondaries.begin();
Expand Down Expand Up @@ -398,6 +404,8 @@ void multiSplitModule(const WasmSplitOptions& options) {
std::unordered_map<Name, Name> funcModules;

ModuleSplitting::Config config;
setCommonSplitConfigs(config, options);

std::string line;
bool newSection = true;
std::vector<Name> moduleNames;
Expand Down Expand Up @@ -436,9 +444,6 @@ void multiSplitModule(const WasmSplitOptions& options) {
}
}

config.usePlaceholders = options.usePlaceholders;
config.importNamespace = options.importNamespace;
config.minimizeNewExportNames = !options.passOptions.debugInfo;
if (options.emitModuleNames && !wasm.name) {
wasm.name = Path::getBaseName(options.output);
}
Expand Down
2 changes: 1 addition & 1 deletion test/lit/help/wasm-split.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
;; CHECK-NEXT: placeholder indices to the function
;; CHECK-NEXT: names.
;; CHECK-NEXT:
;; CHECK-NEXT: --import-namespace [split, instrument, multi-split] When
;; CHECK-NEXT: --import-namespace [split, multi-split, instrument] When
;; CHECK-NEXT: provided as an option for module
;; CHECK-NEXT: splitting, the namespace from which to
;; CHECK-NEXT: import objects from the primary module
Expand Down
18 changes: 9 additions & 9 deletions test/lit/wasm-split/multi-split-escape-names.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@

;; MOD1: (type $2 (func (result i32)))

;; MOD1: (import "" "table" (table $timport$0 3 funcref))
;; MOD1: (import "primary" "table" (table $timport$0 3 funcref))

;; MOD1: (import "" "trampoline_std::operator<<\\28std::__2::basic_ostream<char\\2c\\20std::__2::char_traits<char>>&\\2c\\20wasm::Module&\\29" (func $trampoline_std::operator<<\28std::__2::basic_ostream<char\2c\20std::__2::char_traits<char>>&\2c\20wasm::Module&\29 (result f32)))
;; MOD1: (import "primary" "trampoline_std::operator<<\\28std::__2::basic_ostream<char\\2c\\20std::__2::char_traits<char>>&\\2c\\20wasm::Module&\\29" (func $trampoline_std::operator<<\28std::__2::basic_ostream<char\2c\20std::__2::char_traits<char>>&\2c\20wasm::Module&\29 (result f32)))

;; MOD1: (import "" "trampoline_wasm::Literal::Literal\\28std::__2::array<wasm::Literal\\2c\\204ul>\\20const&\\29" (func $trampoline_wasm::Literal::Literal\28std::__2::array<wasm::Literal\2c\204ul>\20const&\29 (result i64)))
;; MOD1: (import "primary" "trampoline_wasm::Literal::Literal\\28std::__2::array<wasm::Literal\\2c\\204ul>\\20const&\\29" (func $trampoline_wasm::Literal::Literal\28std::__2::array<wasm::Literal\2c\204ul>\20const&\29 (result i64)))

;; MOD1: (elem $0 (i32.const 2) $wasm::Type::getFeatures\28\29\20const)

Expand Down Expand Up @@ -73,11 +73,11 @@

;; MOD2: (type $2 (func (result i64)))

;; MOD2: (import "" "table" (table $timport$0 3 funcref))
;; MOD2: (import "primary" "table" (table $timport$0 3 funcref))

;; MOD2: (import "" "trampoline_std::operator<<\\28std::__2::basic_ostream<char\\2c\\20std::__2::char_traits<char>>&\\2c\\20wasm::Module&\\29" (func $trampoline_std::operator<<\28std::__2::basic_ostream<char\2c\20std::__2::char_traits<char>>&\2c\20wasm::Module&\29 (result f32)))
;; MOD2: (import "primary" "trampoline_std::operator<<\\28std::__2::basic_ostream<char\\2c\\20std::__2::char_traits<char>>&\\2c\\20wasm::Module&\\29" (func $trampoline_std::operator<<\28std::__2::basic_ostream<char\2c\20std::__2::char_traits<char>>&\2c\20wasm::Module&\29 (result f32)))

;; MOD2: (import "" "trampoline_wasm::Type::getFeatures\\28\\29\\20const" (func $trampoline_wasm::Type::getFeatures\28\29\20const (result i32)))
;; MOD2: (import "primary" "trampoline_wasm::Type::getFeatures\\28\\29\\20const" (func $trampoline_wasm::Type::getFeatures\28\29\20const (result i32)))

;; MOD2: (elem $0 (i32.const 0) $wasm::Literal::Literal\28std::__2::array<wasm::Literal\2c\204ul>\20const&\29)

Expand Down Expand Up @@ -124,11 +124,11 @@

;; MOD3: (type $2 (func (result f32)))

;; MOD3: (import "" "table" (table $timport$0 3 funcref))
;; MOD3: (import "primary" "table" (table $timport$0 3 funcref))

;; MOD3: (import "" "trampoline_wasm::Literal::Literal\\28std::__2::array<wasm::Literal\\2c\\204ul>\\20const&\\29" (func $trampoline_wasm::Literal::Literal\28std::__2::array<wasm::Literal\2c\204ul>\20const&\29 (result i64)))
;; MOD3: (import "primary" "trampoline_wasm::Literal::Literal\\28std::__2::array<wasm::Literal\\2c\\204ul>\\20const&\\29" (func $trampoline_wasm::Literal::Literal\28std::__2::array<wasm::Literal\2c\204ul>\20const&\29 (result i64)))

;; MOD3: (import "" "trampoline_wasm::Type::getFeatures\\28\\29\\20const" (func $trampoline_wasm::Type::getFeatures\28\29\20const (result i32)))
;; MOD3: (import "primary" "trampoline_wasm::Type::getFeatures\\28\\29\\20const" (func $trampoline_wasm::Type::getFeatures\28\29\20const (result i32)))

;; MOD3: (elem $0 (i32.const 1) $std::operator<<\28std::__2::basic_ostream<char\2c\20std::__2::char_traits<char>>&\2c\20wasm::Module&\29)

Expand Down
18 changes: 9 additions & 9 deletions test/lit/wasm-split/multi-split.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@

;; MOD1: (type $2 (func (result i32)))

;; MOD1: (import "" "table" (table $timport$0 3 funcref))
;; MOD1: (import "primary" "table" (table $timport$0 3 funcref))

;; MOD1: (import "" "trampoline_B" (func $trampoline_B (result i64)))
;; MOD1: (import "primary" "trampoline_B" (func $trampoline_B (result i64)))

;; MOD1: (import "" "trampoline_C" (func $trampoline_C (result f32)))
;; MOD1: (import "primary" "trampoline_C" (func $trampoline_C (result f32)))

;; MOD1: (elem $0 (i32.const 2) $A)

Expand Down Expand Up @@ -117,11 +117,11 @@

;; MOD2: (type $2 (func (result i64)))

;; MOD2: (import "" "table" (table $timport$0 3 funcref))
;; MOD2: (import "primary" "table" (table $timport$0 3 funcref))

;; MOD2: (import "" "trampoline_A" (func $trampoline_A (result i32)))
;; MOD2: (import "primary" "trampoline_A" (func $trampoline_A (result i32)))

;; MOD2: (import "" "trampoline_C" (func $trampoline_C (result f32)))
;; MOD2: (import "primary" "trampoline_C" (func $trampoline_C (result f32)))

;; MOD2: (elem $0 (i32.const 0) $B)

Expand Down Expand Up @@ -200,11 +200,11 @@

;; MOD3: (type $2 (func (result f32)))

;; MOD3: (import "" "table" (table $timport$0 3 funcref))
;; MOD3: (import "primary" "table" (table $timport$0 3 funcref))

;; MOD3: (import "" "trampoline_A" (func $trampoline_A (result i32)))
;; MOD3: (import "primary" "trampoline_A" (func $trampoline_A (result i32)))

;; MOD3: (import "" "trampoline_B" (func $trampoline_B (result i64)))
;; MOD3: (import "primary" "trampoline_B" (func $trampoline_B (result i64)))

;; MOD3: (elem $0 (i32.const 1) $C)

Expand Down
Loading