Skip to content

Chaos mode MVP: Skip branch optimization in MachBuffer #6039

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
cfallin merged 15 commits into from
Apr 5, 2023
Merged

Chaos mode MVP: Skip branch optimization in MachBuffer #6039

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0a42553
fuzz: Add chaos mode control plane
senekor Mar 16, 2023
f51732a
fuzz: Skip branch optimization with chaos mode
senekor Mar 16, 2023
bb15b08
fuzz: Rename chaos engine -> control plane
senekor Mar 18, 2023
dfa0594
chaos mode: refactoring ControlPlane to be passed through the call st…
MzrW Mar 22, 2023
5f2cfc1
fuzz: annotate chaos todos
senekor Mar 23, 2023
14ba45d
fuzz: cleanup control plane
senekor Apr 3, 2023
fd541f0
fuzz: remove control plane from compiler context
senekor Apr 3, 2023
a0f379b
fuzz: move control plane into emit state
senekor Apr 3, 2023
c8e5039
fuzz: fix remaining compiler errors
senekor Apr 3, 2023
8e7591a
fix tests
senekor Apr 3, 2023
ccc2ba0
refactor emission state ctrl plane accessors
senekor Apr 4, 2023
9e907a4
centralize conditional compilation of chaos mode
senekor Apr 4, 2023
bc76cae
add cranelift-control to published crates
senekor Apr 5, 2023
54cc68c
add cranelift-control to public crates
senekor Apr 5, 2023
fa0eda7
Merge main into fuzz-skip-branch-opt
senekor Apr 5, 2023
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
Prev Previous commit
Next Next commit
fuzz: annotate chaos todos 
Co-authored-by: Falk Zwimpfer <[email protected]>
Co-authored-by: Moritz Waser <[email protected]>
  • Loading branch information
@senekor @FalkZ @MzrW
3 people committed Apr 3, 2023
commit 5f2cfc18daafb2a560abfd71bdd57205e4d9b3e1
2 changes: 1 addition & 1 deletion cranelift/control/src/chaos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ impl ControlPlane {
}
}

/// TODO: should be explained
/// TODO chaos: should be explained
pub fn no_chaos() -> Self {
Copy link
Member

@cfallin cfallin Mar 31, 2023

Choose a reason for hiding this comment

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

I think this body makes sense as the Default impl (an empty ControlPlane should have no affect on Cranelift's behavior as it is today -- this also implies how to use bools, i.e. false should make no change).

Self::new(Vec::new(), false)
}
Expand Down
6 changes: 3 additions & 3 deletions crates/cranelift/src/compiler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ impl Default for CompilerContext {
/// A compiler that compiles a WebAssembly module with Compiler, translating
/// the Wasm to Compiler IR, optimizing it and then translating to assembly.
pub(crate) struct Compiler {
// TODO: can a context be requested in different orders?
// TODO chaos: can a context be requested in different orders?
contexts: Mutex<Vec<CompilerContext>>,
isa: OwnedTargetIsa,
linkopts: LinkOptions,
Expand Down Expand Up @@ -117,7 +117,7 @@ impl Compiler {
}

fn take_context(&self) -> CompilerContext {
// TODO: In chaos mode, we want to construct the ControlPlane ourself
// TODO: chaos In chaos mode, we want to construct the ControlPlane ourself
let candidate = self.contexts.lock().unwrap().pop();
candidate
.map(|mut ctx| {
Expand All @@ -138,7 +138,7 @@ impl Compiler {
}

fn save_context(&self, ctx: CompilerContext) {
// TODO: In chaos mode, we do not want to recycle contexts
// TODO chaos: In chaos mode, we do not want to recycle contexts
self.contexts.lock().unwrap().push(ctx);
}

Expand Down