Skip to content

[NFC] Add validation checks in OptUtils::optimizeAfterInlining #7009

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
merged 3 commits into from
Oct 16, 2024
Merged

[NFC] Add validation checks in OptUtils::optimizeAfterInlining #7009

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0afbb2
debug
kripken Oct 7, 2024
3e07858
format
kripken Oct 15, 2024
3e5aeae
level 2+ only
kripken Oct 16, 2024
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
25 changes: 20 additions & 5 deletions src/passes/opt-utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@
#include <functional>
#include <unordered_set>

#include <ir/element-utils.h>
#include <ir/module-utils.h>
#include <pass.h>
#include <passes/pass-utils.h>
#include <wasm.h>
#include "ir/element-utils.h"
#include "ir/module-utils.h"
#include "pass.h"
#include "passes/pass-utils.h"
#include "wasm-validator.h"
#include "wasm.h"

namespace wasm::OptUtils {

Expand All @@ -42,10 +43,24 @@ inline void addUsefulPassesAfterInlining(PassRunner& runner) {
inline void optimizeAfterInlining(const PassUtils::FuncSet& funcs,
Module* module,
PassRunner* parentRunner) {
// In pass-debug mode, validate before and after these optimizations. This
// helps catch bugs in the middle of passes like inlining and dae. We do this
// at level 2+ and not 1 so that this extra validation is not added to the
// timings that level 1 reports.
if (PassRunner::getPassDebug() >= 2) {
if (!WasmValidator().validate(*module, parentRunner->options)) {
Fatal() << "invalid wasm before optimizeAfterInlining";
}
}
PassUtils::FilteredPassRunner runner(module, funcs, parentRunner->options);
runner.setIsNested(true);
addUsefulPassesAfterInlining(runner);
runner.run();
if (PassRunner::getPassDebug() >= 2) {
if (!WasmValidator().validate(*module, parentRunner->options)) {
Fatal() << "invalid wasm after optimizeAfterInlining";
}
}
}

struct FunctionRefReplacer
Expand Down
Loading