WASM gas schedule #6638

NikVolf · 2017-10-04T14:54:23Z

this actually closes the WASM MVP #6056, since proper gas metering is all that left there

WASM itself can be parameterized by much broader range of opcode types, but seems like they all have roughly the same cpu costs

arkpar · 2017-10-05T11:17:31Z

ethcore/vm/src/schedule.rs

+/// Wasm cost table
+pub struct WasmCosts {
+	/// Arena allocator cost, per byte
+	pub alloc: usize,


Why usize? usize should only be used for representing memory area sizes. Hence the name. u64 should prevent any unexpected issues on 32-bit platforms.

And why all ethereum Schedule members are usize?

No idea, but I think it needs to be fixed.

https://github.com/paritytech/parity/blob/c7ea25227a01aa9d22964f84489d7f16a224ce5c/ethcore/evm/src/evm.rs#L59

oh this is because of that, gas counter for evm uses different size across platforms

i don't use it, so i might stick to u64

arkpar · 2017-10-05T11:19:22Z

ethcore/wasm/src/runtime.rs

@@ -102,6 +103,13 @@ pub struct RuntimeContext {
 	pub value: U256,
 }

+macro_rules! charge {


Why not a simple function?

because of double borrowing of self

seems like a fn charge<F>(&mut self, f: F) where F: FnOnce(&Schedule) -> u64 would work in all cases here

rphmeier · 2017-10-05T15:59:30Z

ethcore/wasm/src/runtime.rs

@@ -369,13 +412,17 @@ impl<'a, 'b> Runtime<'a, 'b> {
 		-> Result<Option<interpreter::RuntimeValue>, InterpreterError>
 	{
 		let amount = context.value_stack.pop_as::<i32>()? as u32;
+
+		charge!(self, self.ext.schedule().wasm.alloc * amount);


depending on the alloc cost, this seems like it could easily overflow a u32 when allocating just a few MB.

it's super easy operation with arena allocator, so it should not be priced more than memory opcodes
and memory limit for wasm is just 16mb

i will change to u64 anyway though to be uniform

rphmeier · 2017-10-05T16:01:38Z

ethcore/wasm/src/runtime.rs

@@ -211,6 +249,9 @@ impl<'a, 'b> Runtime<'a, 'b> {

 		let code = self.memory.get(code_ptr, code_len as usize)?;

+		charge!(self, self.ext.schedule().create_gas as u32);
+		charge!(self, (self.ext.schedule().create_data_gas * code.len()) as u32);


again, using u32 for gas here seems a little flaky. In the EVM code we use u64 in general.

NikVolf · 2017-10-05T20:38:57Z

@rphmeier @arkpar
updated!

debris

I'm not fully familiar with the context of this pr, but it looks good to me. Just one minor (irrelevant) grumble.

debris · 2017-10-09T10:01:12Z

ethcore/wasm/src/lib.rs

 		);

+		let data_section_length = contract_module.data_section()
+			.map(|section| section.entries().iter().fold(0, |sum, entry| sum + entry.value().len()))


using

map(|entry| entry.value().len()).sum()

would be more idiomatic

NikVolf added 4 commits October 4, 2017 17:03

some failing tests

a31e918

Merge remote-tracking branch 'origin/master' into wasm-schedule

0932d1a

finalize

08ad1d5

fallable -> fallible

54129c9

NikVolf added A0-pleasereview 🤓 Pull request needs code review. M4-core ⛓ Core client code / Rust. labels Oct 4, 2017

NikVolf changed the title ~~Wasm gas schedule~~ WASM gas schedule Oct 4, 2017

NikVolf added A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. and removed A0-pleasereview 🤓 Pull request needs code review. labels Oct 4, 2017

alter mul/div/static_i64

4a48ec2

NikVolf added A0-pleasereview 🤓 Pull request needs code review. and removed A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. labels Oct 4, 2017

Update schedule.rs

638bcb6

arkpar reviewed Oct 5, 2017

View reviewed changes

arkpar added A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. and removed A0-pleasereview 🤓 Pull request needs code review. labels Oct 5, 2017

NikVolf added 3 commits October 5, 2017 15:29

to u32

5367c0f

Merge remote-tracking branch 'origin/master' into wasm-schedule

335b002

balance charge also

135d0b2

NikVolf added A0-pleasereview 🤓 Pull request needs code review. and removed A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. labels Oct 5, 2017

arkpar added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Oct 5, 2017

rphmeier reviewed Oct 5, 2017

View reviewed changes

rphmeier added A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. and removed A8-looksgood 🦄 Pull request is reviewed well. labels Oct 5, 2017

review fixes

6f9d37c

NikVolf added the A0-pleasereview 🤓 Pull request needs code review. label Oct 5, 2017

NikVolf removed the A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. label Oct 5, 2017

remove redundant line

907a527

NikVolf mentioned this pull request Oct 7, 2017

WASM MVP #6056

Closed

5 tasks

debris approved these changes Oct 9, 2017

View reviewed changes

debris added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Oct 9, 2017

gavofyork merged commit 1601030 into master Oct 9, 2017

gavofyork deleted the wasm-schedule branch October 9, 2017 11:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WASM gas schedule #6638

WASM gas schedule #6638

NikVolf commented Oct 4, 2017 •

edited

Loading

arkpar Oct 5, 2017

NikVolf Oct 5, 2017 •

edited

Loading

arkpar Oct 5, 2017

NikVolf Oct 5, 2017 •

edited

Loading

arkpar Oct 5, 2017

NikVolf Oct 5, 2017

arkpar Oct 5, 2017

rphmeier Oct 5, 2017

rphmeier Oct 5, 2017

NikVolf Oct 5, 2017

rphmeier Oct 5, 2017

NikVolf commented Oct 5, 2017

debris left a comment

debris Oct 9, 2017

WASM gas schedule #6638

WASM gas schedule #6638

Conversation

NikVolf commented Oct 4, 2017 • edited Loading

Choose a reason for hiding this comment

NikVolf Oct 5, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NikVolf Oct 5, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NikVolf commented Oct 5, 2017

debris left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NikVolf commented Oct 4, 2017 •

edited

Loading

NikVolf Oct 5, 2017 •

edited

Loading

NikVolf Oct 5, 2017 •

edited

Loading