Skip to content
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.

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

Do not memcpy optimize when passed as fn arg #5253

Merged
merged 5 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 13 additions & 3 deletions sway-ir/src/optimize/memcpyopt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ fn local_copy_prop_prememcpy(context: &mut Context, function: Function) -> Resul
let mut loads_map = FxHashMap::<Symbol, Vec<Value>>::default();
let mut stores_map = FxHashMap::<Symbol, Vec<Value>>::default();
let mut instr_info_map = FxHashMap::<Value, InstInfo>::default();
let mut asm_uses = FxHashSet::<Symbol>::default();
let mut escaping_uses = FxHashSet::<Symbol>::default();

for (pos, (block, inst)) in function.instruction_iter(context).enumerate() {
let info = || InstInfo { block, pos };
Expand Down Expand Up @@ -81,11 +81,21 @@ fn local_copy_prop_prememcpy(context: &mut Context, function: Function) -> Resul
for arg in args {
if let Some(arg) = arg.initializer {
if let Some(local) = get_symbol(context, arg) {
asm_uses.insert(local);
escaping_uses.insert(local);
}
}
}
}
Instruction {
op: InstOp::Call(_, args),
..
} => {
for arg in args {
if let Some(local) = get_symbol(context, *arg) {
escaping_uses.insert(local);
}
}
}
_ => (),
}
}
Expand Down Expand Up @@ -151,7 +161,7 @@ fn local_copy_prop_prememcpy(context: &mut Context, function: Function) -> Resul
instr_info.block == block && instr_info.pos > pos
})
// We don't deal with ASM blocks.
|| asm_uses.contains(&dst_local)
|| escaping_uses.contains(&dst_local)
// We don't deal part copies.
|| dst_local.get_type(context) != src_local.get_type(context)
// We don't replace the destination when it's an arg.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"typeArguments": null
},
"name": "C0",
"offset": 3420
"offset": 3436
},
{
"configurableType": {
Expand All @@ -16,7 +16,7 @@
"typeArguments": null
},
"name": "C1",
"offset": 3428
"offset": 3444
},
{
"configurableType": {
Expand All @@ -25,7 +25,7 @@
"typeArguments": null
},
"name": "C2",
"offset": 3444
"offset": 3460
},
{
"configurableType": {
Expand All @@ -34,7 +34,7 @@
"typeArguments": []
},
"name": "C3",
"offset": 3476
"offset": 3492
},
{
"configurableType": {
Expand All @@ -43,7 +43,7 @@
"typeArguments": []
},
"name": "C4",
"offset": 3492
"offset": 3508
},
{
"configurableType": {
Expand All @@ -52,7 +52,7 @@
"typeArguments": []
},
"name": "C5",
"offset": 3508
"offset": 3524
},
{
"configurableType": {
Expand All @@ -61,7 +61,7 @@
"typeArguments": null
},
"name": "C6",
"offset": 3524
"offset": 3540
},
{
"configurableType": {
Expand All @@ -70,7 +70,7 @@
"typeArguments": null
},
"name": "C7",
"offset": 3540
"offset": 3556
},
{
"configurableType": {
Expand All @@ -79,7 +79,7 @@
"typeArguments": null
},
"name": "C9",
"offset": 3588
"offset": 3604
}
],
"functions": [
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[[package]]
name = "core"
source = "path+from-root-1621225C7A88836C"

[[package]]
name = "memcpy"
source = "member"
dependencies = ["std"]

[[package]]
name = "std"
source = "path+from-root-1621225C7A88836C"
dependencies = ["core"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[project]
authors = ["Fuel Labs <[email protected]>"]
license = "Apache-2.0"
name = "memcpy"
entry = "main.sw"

[dependencies]
std = { path = "../../../../../../../sway-lib-std" }
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
script;

fn main() -> u64 {
let a = A { a: 11 };
let mut ptr_a = ptr(a);
ptr_a.write(A { a: 22 });
assert(a.a == 11);
a.a
}

struct A {
a: u64,
}

#[inline(never)]
fn ptr<T>(t: T) -> raw_ptr {
__addr_of(t)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
category = "run"
expected_result = { action = "return", value = 11 }
validate_abi = false
expected_warnings=6
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ script;
use basic_storage_abi::{BasicStorage, Quad};

fn main() -> u64 {
let addr = abi(BasicStorage, 0x01e64bbd633f1e8cf9d9a712bc7b8f1003c7b8d9796a0d3cd234370881ea6f0a);
let addr = abi(BasicStorage, 0xafd842e74db4e85a770b0569a9df1226d1f57087cb331be88aa37387f6d8841d);
let key = 0x0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff;
let value = 4242;

Expand Down
Loading