From 7f2d389a687ab3dc328f75a32bbd220b4af3c64b Mon Sep 17 00:00:00 2001 From: Sergey Pepyakin Date: Wed, 18 Apr 2018 18:39:28 +0300 Subject: [PATCH 1/6] Remove extern "C" We already encountered such behavior (bug?) in pwasm-std, I believe. --- polkadot/parachain/test-chains/basic_add/src/wasm.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polkadot/parachain/test-chains/basic_add/src/wasm.rs b/polkadot/parachain/test-chains/basic_add/src/wasm.rs index 95276d3950cbe..a97a46840b710 100644 --- a/polkadot/parachain/test-chains/basic_add/src/wasm.rs +++ b/polkadot/parachain/test-chains/basic_add/src/wasm.rs @@ -22,7 +22,7 @@ use super::{HeadData, BlockData}; #[lang = "panic_fmt"] #[no_mangle] -pub extern "C" fn panic_fmt( +pub extern fn panic_fmt( _args: ::core::fmt::Arguments, _file: &'static str, _line: u32 From bb39328ea10dd11994a1d2a6edd318b8425abf30 Mon Sep 17 00:00:00 2001 From: Sergey Pepyakin Date: Wed, 18 Apr 2018 18:39:53 +0300 Subject: [PATCH 2/6] Fix `panic_fmt` signature by adding `_col` Wrong `panic_fmt` signature can inhibit some optimizations in LTO mode. --- polkadot/parachain/test-chains/basic_add/src/wasm.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/polkadot/parachain/test-chains/basic_add/src/wasm.rs b/polkadot/parachain/test-chains/basic_add/src/wasm.rs index a97a46840b710..007689f085a0e 100644 --- a/polkadot/parachain/test-chains/basic_add/src/wasm.rs +++ b/polkadot/parachain/test-chains/basic_add/src/wasm.rs @@ -25,7 +25,8 @@ use super::{HeadData, BlockData}; pub extern fn panic_fmt( _args: ::core::fmt::Arguments, _file: &'static str, - _line: u32 + _line: u32, + _col: u32, ) -> ! { use core::intrinsics; unsafe { From 6e1acd8f4cf2ce01c6d1e82b46ae52830579b7ae Mon Sep 17 00:00:00 2001 From: Sergey Pepyakin Date: Wed, 18 Apr 2018 18:41:07 +0300 Subject: [PATCH 3/6] Add linker flags and use wasm-gc in build script Pass --import-memory to LLD to emit wasm binary with imported memory. Also use wasm-gc instead of wasm-build. --- polkadot/parachain/test-chains/build_test_chains.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/polkadot/parachain/test-chains/build_test_chains.sh b/polkadot/parachain/test-chains/build_test_chains.sh index d019ffe764948..54c5c9a289603 100755 --- a/polkadot/parachain/test-chains/build_test_chains.sh +++ b/polkadot/parachain/test-chains/build_test_chains.sh @@ -6,8 +6,7 @@ for i in */ do i=${i%/} cd $i - cargo build --target=wasm32-unknown-unknown --release --no-default-features - wasm-build --target wasm32-unknown-unknown ./target $i - mv ./target/$i.wasm ../../tests/res/$i.wasm + RUSTFLAGS="-C link-arg=--import-memory" cargo +nightly-2018-03-07 build --target=wasm32-unknown-unknown --release --no-default-features + wasm-gc target/wasm32-unknown-unknown/release/$i.wasm ../../tests/res/$i.wasm cd .. done From 633ba29a13be1df018689068964234d8756f826b Mon Sep 17 00:00:00 2001 From: Sergey Pepyakin Date: Wed, 18 Apr 2018 18:41:48 +0300 Subject: [PATCH 4/6] Fix effective_max. I'm not sure why it was the way it was actually. --- polkadot/parachain/src/wasm.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polkadot/parachain/src/wasm.rs b/polkadot/parachain/src/wasm.rs index 61b826e47cca6..92968564b3b98 100644 --- a/polkadot/parachain/src/wasm.rs +++ b/polkadot/parachain/src/wasm.rs @@ -61,7 +61,7 @@ impl ModuleImportResolver for Resolver { descriptor: &MemoryDescriptor, ) -> Result { if field_name == "memory" { - let effective_max = descriptor.maximum().unwrap_or(self.max_memory + 1); + let effective_max = descriptor.maximum().unwrap_or(self.max_memory); if descriptor.initial() > self.max_memory || effective_max > self.max_memory { Err(WasmError::Instantiation("Module requested too much memory".to_owned())) } else { From 7097484b9821c5c8eb83bd3830a1a36ecc3b0b72 Mon Sep 17 00:00:00 2001 From: Sergey Pepyakin Date: Wed, 18 Apr 2018 18:41:57 +0300 Subject: [PATCH 5/6] Recompile wasm. --- polkadot/parachain/tests/res/basic_add.wasm | Bin 20002 -> 45511 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/polkadot/parachain/tests/res/basic_add.wasm b/polkadot/parachain/tests/res/basic_add.wasm index 47dfd0124a4aa03dfed2b0d1d615ba0629f22092..1cd8ab6d19893a76c0916a623b395a497e0bacfd 100755 GIT binary patch literal 45511 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
d>vTG-~(kIX->&TzR&8 z#~}q1x2z7`GBaI0q+l~2uZmg?^y!S`hcz||%W|5gD5huC&66GK?!z#CIFnDn);%QU zf-3CC=J=F->8yVjRUWiQ~OE+Bh!a zxDLlBaqPzNTR6T2$8-1%;g>(>aMF(BlQ^!%@%Ldq#CQWg&-(W+EOYO+u$~!baa@JG zm55>B)R@K5#qlv5+4iS!OyT%Ts5F7&Vp^yF9@06(z82SQIF8^5@{BPYGdKqK;cqam z#r0ksN$0I7v=&GH1a&@%y06CdAK@6q@f$djmY|NC&=!BJxVDaPTlmEGkR)`GZ={oH z{3T6jQfLXvKaB*^{H#yQ1sq#>=AGM?sF8$~pA`gKDcR^1NeFZ(Y zSI3xiywtV-4P9Nwdvjgoc{$7Csux-hd>cxxU;$alG7D>93TqJntVHc3y|(`UjhP7-lJA3Wpi-#}i{)yrk}p;Is`e#}F_Qs)(!oWbTG%#K$jt=JF&?*nd$hm>O zMZIyo631}cO5?p zx8giO=K}(@T&|Ug`Pn1odz;$n9V?9GOa1+Y{CK(CTk0Q9fELMiwn7ai%MU5WhIy_$L#Te!XOJjWlrDAV>I9;b}KwLb% zy>b|lh5pFQT%|fEV~Db&x$)ldLG)>Ctgloq_6}!C0bPFCTyt5tk%E%t++Yb_v?6?C zg;EuWZGXfhkvWaoCb^uS_zw{MBlNBUjjzYmt9T)Tc-ss#z`d6r!lr7P^JAd%eMcvz zN5-m0j*PGY@?or08Sk$a#`_B8v1(y-c-5mXDMh`#)785*Mex0ijL$(e9f2npq*cm* z%s_ANXde9T9~&56eJEfvVc$1>{OCZxNX^92*&~ACCaAyK2QLK(HOuYe>~s^H3%%w3 za-qLe%Jo&CMS6$V)CZC+4DJ)Z`$Bat-#c5b016A$yXMMAKwECK(pMhK^%tuHaFi5t z!)tGErtNYid!dex7e^s*_%n87X8!nG73UQuRJu@aexO>-_l;M^ieu$`esFMjU0tE{ zVLr$gG_b03b7U4A{3rw8Xl1mow}PnvuGI0u@cK7^mVtp6q);vq^&FVqJ2)`bSM7(l zwZA;vv5!5}Qy5)cms1)`R8wEBT7|zhH<;_KR0oUI;SCkkQ}pX;C|vQs_F$@j8|8DD+p0V`IfZD)~ZrcvB0i^0`0@-=5Fs<`2)@JtDY7$?ytFI0AhH#c*4>;#JDCfavAbK~upukwmg}P>3BN zqyW0HTyJT#Sm+%c=+70(x#2B!t*-T1;b`^f*x@<@FqwV12qdWTg5*O0UUAuONMR1sY$GcbHC5(KE48+LyPS$KF+z?9yb8z|@c3ZnzV z+wQ0K8!U+IEM;6zkERce!6dqb?Y?F6hUbB;bn_Da4-S+{`D$Ts3{%qRcx7O?tM<}R zv4r83fzf;!&uMZ4ebqi#cf(h`wA|2xSnA7z4p^6XlvL@<4-Q`)Cj4ga-5$a5C?3Og OGhx2EutRPfo&EnOWkmD< delta 1864 zcmaJ>TWnNC7@mLToV}gh_G~F_Ww-6@g|OA2MPZ9Vq$hw#^Z{ck@q)eBLb`3YQc3~A zZo?J{+LGES#tSi&2jUI9Y+^KN2r&_i5WGG3(uXF-_y8gVH6hW&Z_e(bPoCub|IGLQ z^WSGK{KQWlryT3tH9(9pN_skYE=M^{S%=8EYXhvbV;xZDDK2`lBjKUlyN27ldUo_? z+jnR8^k%!6(70!yXJBw>A17{$Xaq(LlZbI9-~fyZlQENH3H*5qhfTVZd3=;3XY90L zd5QUJh&g20#C^d~MP<0UYH>|%-5pB;3(rQ>+DMvzl~lu#<)$5Cyj6W$U!&$CkMqA0 zDjYpdRq9N1j{K^xemUqH^%>&IXefz$)Y*o6p>m@k2jR}fHqZ-=t3dy5+*-$3h)E;G zne%0%Lz1vc@nD#%ez_xO$C%`f%p{p))|Zt*pjU%TAMoLTFQa8H=5BD>J(c6qY!Ry^m%bJOMa?7_Ky4Cd zxHP1&8M6)&Q4XOs_r(Pw6OyMnM3T}RJEY(QGma>3;0_xoXi4<;3eqHixmcR}z#)G) z2tFQ6a~qa~V`S1?>Q$PjTtEV-gFq){3ubNSloPr@h=O#@nz$X~VCrz}{u&)SN!}t- zV1$tLk-VDhU0qcUg6j~INbS1X(!0_-7XKfWOIpR4kJ+N|YyTQTJDajMDWK{HYnPy| z#jJG@l@>zO4Y32EplTdkjN#}WOj4k5WbiVzU;qqhI+Tf<(%2kg)_>Fydy3aVfVk1S zXr?$FaRc*lbY~QX-rso{^o5}%4SJAxtMqRSF$eBNt8NXBNRKqbyzt4;Lj=uRyY7h~ zI$8NbJEQ<-}| z=TixFZf~3MSpqeP?7Ic~g~j_{*KW=ns3og#{=jjHA}$>}@?+9p%+HcYRSG0AI(iqh z-y2;E`pf7FA43ujk8wo<)rFP0aVk2S8;kh8%#vQ|w>^c0vE~w9eQ?>oxY}^=j}&7Y zL!O}5atMtV&OGi`SYu|;W1%d-wC^xeo%sYYbtoSPeaEF2^KDqi#$${00rbHkw{^>0 z{kHM`<(CqA-ncuG`X1;jpl6Y!z7BO6+m4}8PP48n6|VI^Kox!rLJ48kH-+>|6}n0r z52rYMWsmge`|sXhJujGJ!jz-Q2=L00HWbBqxnb$m1UyvQ2D2Ppda(I~v`a{NSsudk zue^w38zvs4MJhk>7DZI!tKht!kRw?$bnS{mdqwU#cc%e)9|scJ&MmtNgLY z3f~|5I>3K6)Y~WIw$}_i5{$9C@#7hGzmI^SVQc~XDex)$c&6R2jIANY{6Nb4wWWOr z6yv}<1!DpA5zwX!HV=EgC7 zvdO%fv<~?SD^3anuPF<9`+Ku}z1bat-$*Lw)I??1id9{m+nZau()X?0{#;jK{?wJg EKe-uXzW@LL From 0f253a8cbdcf236d7d154bc2c292f0a46a7f0ece Mon Sep 17 00:00:00 2001 From: Sergey Pepyakin Date: Wed, 18 Apr 2018 18:45:01 +0300 Subject: [PATCH 6/6] Fix indent --- polkadot/parachain/test-chains/basic_add/src/wasm.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polkadot/parachain/test-chains/basic_add/src/wasm.rs b/polkadot/parachain/test-chains/basic_add/src/wasm.rs index 007689f085a0e..e236e22048a7b 100644 --- a/polkadot/parachain/test-chains/basic_add/src/wasm.rs +++ b/polkadot/parachain/test-chains/basic_add/src/wasm.rs @@ -26,7 +26,7 @@ pub extern fn panic_fmt( _args: ::core::fmt::Arguments, _file: &'static str, _line: u32, - _col: u32, + _col: u32, ) -> ! { use core::intrinsics; unsafe {