Skip to content

Commit 0649820

Browse files
mathetakemathetake
authored
Removes non-static locals collection (#2236)
This stops gathering `NonStaticLocals` during validation phase, which was previously used to do the "fast pass" on variable search by the frontend. However, it had no impact after the last mile refactoring included in 1.7.0 and caused tons of allocations. As as result, you can see the compilation perf improvements especially around memory pressure without any impacts on the runtime perf ### Zig ``` goos: darwin goarch: arm64 pkg: github.com/tetratelabs/wazero/internal/integration_test/stdlibs │ old_zig.txt │ new_zig.txt │ │ sec/op │ sec/op vs base │ Zig/Compile/test-opt.wasm-10 3.769 ± 1% 3.761 ± 1% ~ (p=0.485 n=6) Zig/Run/test-opt.wasm-10 18.78 ± 1% 18.74 ± 0% -0.21% (p=0.041 n=6) Zig/Compile/test.wasm-10 4.677 ± 1% 4.515 ± 0% -3.48% (p=0.002 n=6) Zig/Run/test.wasm-10 19.31 ± 1% 19.27 ± 1% ~ (p=1.000 n=6) geomean 8.942 8.850 -1.04% │ old_zig.txt │ new_zig.txt │ │ B/op │ B/op vs base │ Zig/Compile/test-opt.wasm-10 394.7Mi ± 0% 393.5Mi ± 0% -0.30% (p=0.002 n=6) Zig/Run/test-opt.wasm-10 741.7Mi ± 0% 741.7Mi ± 0% ~ (p=0.621 n=6) Zig/Compile/test.wasm-10 659.5Mi ± 0% 599.3Mi ± 0% -9.12% (p=0.002 n=6) Zig/Run/test.wasm-10 1.296Gi ± 0% 1.296Gi ± 0% ~ (p=0.102 n=6) geomean 711.5Mi 694.2Mi -2.44% │ old_zig.txt │ new_zig.txt │ │ allocs/op │ allocs/op vs base │ Zig/Compile/test-opt.wasm-10 362.6k ± 0% 343.2k ± 0% -5.34% (p=0.002 n=6) Zig/Run/test-opt.wasm-10 51.58k ± 0% 51.58k ± 0% ~ (p=0.978 n=6) Zig/Compile/test.wasm-10 514.7k ± 0% 288.1k ± 0% -44.04% (p=0.002 n=6) Zig/Run/test.wasm-10 2.156M ± 0% 2.156M ± 0% ~ (p=0.273 n=6) geomean 379.5k 323.8k -14.69% ``` ### TinyGo ``` goos: darwin goarch: arm64 pkg: github.com/tetratelabs/wazero/internal/integration_test/stdlibs │ old_tinygo.txt │ new_tinygo.txt │ │ sec/op │ sec/op vs base │ TinyGo/Compile/container_heap.test-10 410.8m ± 1% 399.8m ± 0% -2.69% (p=0.001 n=7) TinyGo/Run/container_heap.test-10 14.41m ± 0% 14.29m ± 2% -0.77% (p=0.026 n=7) TinyGo/Compile/container_list.test-10 410.5m ± 1% 398.1m ± 0% -3.02% (p=0.001 n=7) TinyGo/Run/container_list.test-10 14.27m ± 2% 14.16m ± 1% ~ (p=0.073 n=7) TinyGo/Compile/container_ring.test-10 403.7m ± 1% 392.5m ± 2% -2.77% (p=0.001 n=7) TinyGo/Run/container_ring.test-10 14.24m ± 0% 14.27m ± 1% ~ (p=0.259 n=7) TinyGo/Compile/crypto_des.test-10 418.8m ± 0% 408.1m ± 0% -2.56% (p=0.001 n=7) TinyGo/Run/crypto_des.test-10 18.23m ± 0% 18.17m ± 1% ~ (p=0.456 n=7) TinyGo/Compile/crypto_md5.test-10 417.3m ± 2% 406.1m ± 1% -2.68% (p=0.001 n=7) TinyGo/Run/crypto_md5.test-10 20.50m ± 0% 20.45m ± 1% ~ (p=0.128 n=7) TinyGo/Compile/crypto_rc4.test-10 402.2m ± 1% 390.5m ± 0% -2.90% (p=0.001 n=7) TinyGo/Run/crypto_rc4.test-10 160.8m ± 0% 161.0m ± 1% ~ (p=1.000 n=7) TinyGo/Compile/crypto_sha1.test-10 417.2m ± 1% 404.5m ± 1% -3.04% (p=0.001 n=7) TinyGo/Run/crypto_sha1.test-10 15.93m ± 1% 15.90m ± 1% ~ (p=0.710 n=7) TinyGo/Compile/crypto_sha256.test-10 423.4m ± 1% 412.4m ± 1% -2.60% (p=0.001 n=7) TinyGo/Run/crypto_sha256.test-10 16.16m ± ∞ ¹ 16.05m ± ∞ ¹ ~ (p=0.381 n=2+5) geomean 94.17m 92.70m -1.56% ¹ need >= 6 samples for confidence interval at level 0.95 │ old_tinygo.txt │ new_tinygo.txt │ │ B/op │ B/op vs base │ TinyGo/Compile/container_heap.test-10 48.55Mi ± 0% 48.30Mi ± 0% -0.52% (p=0.001 n=7) TinyGo/Run/container_heap.test-10 16.63Mi ± 0% 16.63Mi ± 0% ~ (p=0.557 n=7) TinyGo/Compile/container_list.test-10 48.53Mi ± 0% 48.29Mi ± 0% -0.51% (p=0.001 n=7) TinyGo/Run/container_list.test-10 16.40Mi ± 0% 16.40Mi ± 0% ~ (p=0.364 n=7) TinyGo/Compile/container_ring.test-10 47.78Mi ± 0% 47.53Mi ± 0% -0.52% (p=0.001 n=7) TinyGo/Run/container_ring.test-10 16.30Mi ± 0% 16.30Mi ± 0% ~ (p=0.128 n=7) TinyGo/Compile/crypto_des.test-10 48.67Mi ± 0% 48.42Mi ± 0% -0.51% (p=0.001 n=7) TinyGo/Run/crypto_des.test-10 16.76Mi ± 0% 16.76Mi ± 0% ~ (p=0.902 n=7) TinyGo/Compile/crypto_md5.test-10 48.73Mi ± 0% 48.48Mi ± 0% -0.51% (p=0.001 n=7) TinyGo/Run/crypto_md5.test-10 44.97Mi ± 0% 44.97Mi ± 0% ~ (p=0.402 n=7) TinyGo/Compile/crypto_rc4.test-10 47.76Mi ± 0% 47.52Mi ± 0% -0.51% (p=0.001 n=7) TinyGo/Run/crypto_rc4.test-10 29.28Mi ± 0% 29.28Mi ± 0% ~ (p=0.104 n=7) TinyGo/Compile/crypto_sha1.test-10 48.97Mi ± 0% 48.72Mi ± 0% -0.52% (p=0.001 n=7) TinyGo/Run/crypto_sha1.test-10 17.44Mi ± 0% 17.44Mi ± 0% ~ (p=1.000 n=7) TinyGo/Compile/crypto_sha256.test-10 48.81Mi ± 0% 48.56Mi ± 0% -0.51% (p=0.001 n=7) TinyGo/Run/crypto_sha256.test-10 17.53Mi ± ∞ ¹ 17.53Mi ± ∞ ¹ ~ (p=0.381 n=2+5) geomean 31.45Mi 31.37Mi -0.26% ¹ need >= 6 samples for confidence interval at level 0.95 │ old_tinygo.txt │ new_tinygo.txt │ │ allocs/op │ allocs/op vs base │ TinyGo/Compile/container_heap.test-10 83.67k ± 0% 83.46k ± 0% -0.25% (p=0.011 n=7) TinyGo/Run/container_heap.test-10 374.9k ± 0% 374.9k ± 0% ~ (p=1.000 n=7) TinyGo/Compile/container_list.test-10 83.34k ± 0% 83.19k ± 0% -0.19% (p=0.002 n=7) TinyGo/Run/container_list.test-10 370.0k ± 0% 370.0k ± 0% ~ (p=0.674 n=7) TinyGo/Compile/container_ring.test-10 83.26k ± 0% 83.08k ± 0% -0.22% (p=0.004 n=7) TinyGo/Run/container_ring.test-10 367.6k ± 0% 367.6k ± 0% ~ (p=0.249 n=7) TinyGo/Compile/crypto_des.test-10 83.68k ± 0% 83.53k ± 0% -0.18% (p=0.004 n=7) TinyGo/Run/crypto_des.test-10 378.1k ± 0% 378.1k ± 0% ~ (p=0.437 n=7) TinyGo/Compile/crypto_md5.test-10 83.86k ± 0% 83.67k ± 0% -0.23% (p=0.001 n=7) TinyGo/Run/crypto_md5.test-10 393.3k ± 0% 393.3k ± 0% ~ (p=0.592 n=7) TinyGo/Compile/crypto_rc4.test-10 83.32k ± 0% 83.20k ± 0% -0.14% (p=0.011 n=7) TinyGo/Run/crypto_rc4.test-10 367.1k ± 0% 367.1k ± 0% ~ (p=0.102 n=7) TinyGo/Compile/crypto_sha1.test-10 84.05k ± 0% 83.87k ± 0% -0.21% (p=0.002 n=7) TinyGo/Run/crypto_sha1.test-10 392.7k ± 0% 392.7k ± 0% ~ (p=1.000 n=7) TinyGo/Compile/crypto_sha256.test-10 83.86k ± 0% 83.67k ± 0% -0.24% (p=0.001 n=7) TinyGo/Run/crypto_sha256.test-10 394.5k ± ∞ ¹ 394.5k ± ∞ ¹ ~ (p=0.952 n=2+5) geomean 178.2k 178.0k -0.10% ``` ### wasip1 ``` goos: darwin goarch: arm64 pkg: github.com/tetratelabs/wazero/internal/integration_test/stdlibs │ old_wasip1.txt │ new_wasip1.txt │ │ sec/op │ sec/op vs base │ Wasip1/Compile/src_archive_tar.test-10 2.066 ± 1% 2.066 ± 1% ~ (p=1.000 n=7) Wasip1/Run/src_archive_tar.test-10 398.9m ± 1% 398.9m ± 0% ~ (p=0.902 n=7) Wasip1/Compile/src_bufio.test-10 1.405 ± 0% 1.405 ± 0% ~ (p=0.318 n=7) Wasip1/Run/src_bufio.test-10 120.1m ± 0% 120.0m ± 0% ~ (p=0.456 n=7) Wasip1/Compile/src_bytes.test-10 1.453 ± 0% 1.452 ± 0% ~ (p=0.383 n=7) Wasip1/Run/src_bytes.test-10 468.9m ± 1% 467.7m ± 1% ~ (p=1.000 n=7) Wasip1/Compile/src_context.test-10 1.565 ± 0% 1.562 ± 0% -0.18% (p=0.001 n=7) Wasip1/Run/src_context.test-10 31.52m ± 1% 31.51m ± 1% ~ (p=0.620 n=7) Wasip1/Compile/src_encoding_ascii85.test-10 1.262 ± ∞ ¹ 1.262 ± 0% ~ (p=0.889 n=2+7) geomean 565.3m 564.9m -0.07% ¹ need >= 6 samples for confidence interval at level 0.95 │ old_wasip1.txt │ new_wasip1.txt │ │ B/op │ B/op vs base │ Wasip1/Compile/src_archive_tar.test-10 93.16Mi ± 0% 92.70Mi ± 0% -0.50% (p=0.001 n=7) Wasip1/Run/src_archive_tar.test-10 286.0Mi ± 0% 286.0Mi ± 0% ~ (p=0.246 n=7) Wasip1/Compile/src_bufio.test-10 74.12Mi ± 0% 73.79Mi ± 0% -0.45% (p=0.001 n=7) Wasip1/Run/src_bufio.test-10 105.3Mi ± 0% 105.3Mi ± 0% ~ (p=0.780 n=7) Wasip1/Compile/src_bytes.test-10 75.32Mi ± 0% 74.96Mi ± 0% -0.47% (p=0.001 n=7) Wasip1/Run/src_bytes.test-10 605.0Mi ± 0% 605.0Mi ± 0% ~ (p=1.000 n=7) Wasip1/Compile/src_context.test-10 78.07Mi ± 0% 77.68Mi ± 0% -0.49% (p=0.001 n=7) Wasip1/Run/src_context.test-10 71.52Mi ± 0% 71.52Mi ± 0% ~ (p=0.516 n=7) Wasip1/Compile/src_encoding_ascii85.test-10 70.38Mi ± ∞ ¹ 70.08Mi ± 0% ~ (p=0.056 n=2+7) geomean 115.7Mi 115.4Mi -0.26% ¹ need >= 6 samples for confidence interval at level 0.95 │ old_wasip1.txt │ new_wasip1.txt │ │ allocs/op │ allocs/op vs base │ Wasip1/Compile/src_archive_tar.test-10 265.0k ± 0% 256.1k ± 0% -3.37% (p=0.001 n=7) Wasip1/Run/src_archive_tar.test-10 7.831k ± 0% 7.830k ± 0% ~ (p=0.592 n=7) Wasip1/Compile/src_bufio.test-10 195.3k ± 0% 189.1k ± 0% -3.19% (p=0.001 n=7) Wasip1/Run/src_bufio.test-10 3.728k ± 0% 3.728k ± 0% ~ (p=1.000 n=7) ¹ Wasip1/Compile/src_bytes.test-10 203.7k ± 0% 197.0k ± 0% -3.31% (p=0.001 n=7) Wasip1/Run/src_bytes.test-10 6.377k ± 0% 6.377k ± 0% ~ (p=0.559 n=7) Wasip1/Compile/src_context.test-10 221.4k ± 0% 214.2k ± 0% -3.29% (p=0.001 n=7) Wasip1/Run/src_context.test-10 3.814k ± 1% 3.814k ± 0% ~ (p=0.192 n=7) Wasip1/Compile/src_encoding_ascii85.test-10 182.3k ± ∞ ² 176.6k ± 0% ~ (p=0.056 n=2+7) geomean 40.64k 39.90k -1.82% ``` Signed-off-by: Takeshi Yoneda <t.y.mathetake@gmail.com>
1 parent 747609b commit 0649820

File tree

5 files changed

+72
-95
lines changed

5 files changed

+72
-95
lines changed

‎internal/engine/wazevo/frontend/frontend_test.go

Lines changed: 70 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -442,10 +442,10 @@ blk3: (v5:i32) <-- (blk1,blk2)
442442
exp: `
443443
blk0: (exec_ctx:i64, module_ctx:i64, v2:i32)
444444
v3:i32 = Iconst_32 0x0
445-
Jump blk1
445+
Jump blk1, v2
446446
447-
blk1: () <-- (blk0)
448-
Return v2
447+
blk1: (v4:i32) <-- (blk0)
448+
Return v4
449449
450450
blk2: ()
451451
`,
@@ -462,15 +462,15 @@ blk1: () <-- (blk0)
462462
m: testcases.ReferenceValueFromUnsealedBlock2.Module,
463463
exp: `
464464
blk0: (exec_ctx:i64, module_ctx:i64, v2:i32)
465-
Jump blk1
465+
Jump blk1, v2
466466
467-
blk1: () <-- (blk0,blk1)
468-
Brnz v2, blk1
467+
blk1: (v3:i32) <-- (blk0,blk1)
468+
Brnz v3, blk1, v3
469469
Jump blk4
470470
471471
blk2: () <-- (blk3)
472-
v3:i32 = Iconst_32 0x0
473-
Jump blk_ret, v3
472+
v4:i32 = Iconst_32 0x0
473+
Jump blk_ret, v4
474474
475475
blk3: () <-- (blk4)
476476
Jump blk2
@@ -496,8 +496,8 @@ blk3: () <-- (blk4)
496496
Jump fallthrough
497497
498498
blk2: () <-- (blk3)
499-
v3:i32 = Iconst_32 0x0
500-
Jump blk_ret, v3
499+
v4:i32 = Iconst_32 0x0
500+
Jump blk_ret, v4
501501
`,
502502
},
503503
{
@@ -1058,22 +1058,22 @@ blk1: () <-- (blk0)
10581058
Call f1:sig1, exec_ctx, module_ctx
10591059
v5:i64 = Load module_ctx, 0x8
10601060
v6:i64 = Uload32 module_ctx, 0x10
1061-
Jump blk3
1061+
Jump blk3, v2
10621062
10631063
blk2: () <-- (blk0)
1064-
Jump blk3
1064+
Jump blk3, v2
10651065
1066-
blk3: () <-- (blk1,blk2)
1067-
v7:i64 = Iconst_64 0x4
1068-
v8:i64 = UExtend v2, 32->64
1069-
v9:i64 = Uload32 module_ctx, 0x10
1070-
v10:i64 = Iadd v8, v7
1071-
v11:i32 = Icmp lt_u, v9, v10
1072-
ExitIfTrue v11, exec_ctx, memory_out_of_bounds
1073-
v12:i64 = Load module_ctx, 0x8
1074-
v13:i64 = Iadd v12, v8
1075-
v14:i32 = Load v13, 0x0
1076-
Jump blk_ret, v14
1066+
blk3: (v7:i32) <-- (blk1,blk2)
1067+
v8:i64 = Iconst_64 0x4
1068+
v9:i64 = UExtend v7, 32->64
1069+
v10:i64 = Uload32 module_ctx, 0x10
1070+
v11:i64 = Iadd v9, v8
1071+
v12:i32 = Icmp lt_u, v10, v11
1072+
ExitIfTrue v12, exec_ctx, memory_out_of_bounds
1073+
v13:i64 = Load module_ctx, 0x8
1074+
v14:i64 = Iadd v13, v9
1075+
v15:i32 = Load v14, 0x0
1076+
Jump blk_ret, v15
10771077
`,
10781078
expAfterPasses: `
10791079
signatures:
@@ -1093,16 +1093,16 @@ blk2: () <-- (blk0)
10931093
Jump fallthrough
10941094
10951095
blk3: () <-- (blk1,blk2)
1096-
v7:i64 = Iconst_64 0x4
1097-
v8:i64 = UExtend v2, 32->64
1098-
v9:i64 = Uload32 module_ctx, 0x10
1099-
v10:i64 = Iadd v8, v7
1100-
v11:i32 = Icmp lt_u, v9, v10
1101-
ExitIfTrue v11, exec_ctx, memory_out_of_bounds
1102-
v12:i64 = Load module_ctx, 0x8
1103-
v13:i64 = Iadd v12, v8
1104-
v14:i32 = Load v13, 0x0
1105-
Jump blk_ret, v14
1096+
v8:i64 = Iconst_64 0x4
1097+
v9:i64 = UExtend v2, 32->64
1098+
v10:i64 = Uload32 module_ctx, 0x10
1099+
v11:i64 = Iadd v9, v8
1100+
v12:i32 = Icmp lt_u, v10, v11
1101+
ExitIfTrue v12, exec_ctx, memory_out_of_bounds
1102+
v13:i64 = Load module_ctx, 0x8
1103+
v14:i64 = Iadd v13, v9
1104+
v15:i32 = Load v14, 0x0
1105+
Jump blk_ret, v15
11061106
`,
11071107
},
11081108
{
@@ -2869,7 +2869,7 @@ blk0: (exec_ctx:i64, module_ctx:i64, v2:i32)
28692869
28702870
blk1: () <-- (blk0)
28712871
v11:i32 = Load v9, 0x10
2872-
Jump blk3
2872+
Jump blk3, v2
28732873
28742874
blk2: () <-- (blk0)
28752875
v12:i32 = Load v9, 0x10
@@ -2880,13 +2880,18 @@ blk2: () <-- (blk0)
28802880
ExitIfTrue v16, exec_ctx, memory_out_of_bounds
28812881
v17:i32 = Load v9, 0x30
28822882
v18:i32 = Load v9, 0x25
2883-
Jump blk3
2883+
Jump blk3, v2
28842884
2885-
blk3: () <-- (blk1,blk2)
2886-
v19:i64 = Load module_ctx, 0x8
2887-
v20:i64 = UExtend v2, 32->64
2888-
v21:i64 = Iadd v19, v20
2889-
v22:i32 = Load v21, 0x15
2885+
blk3: (v19:i32) <-- (blk1,blk2)
2886+
v20:i64 = Iconst_64 0x19
2887+
v21:i64 = UExtend v19, 32->64
2888+
v22:i64 = Uload32 module_ctx, 0x10
2889+
v23:i64 = Iadd v21, v20
2890+
v24:i32 = Icmp lt_u, v22, v23
2891+
ExitIfTrue v24, exec_ctx, memory_out_of_bounds
2892+
v25:i64 = Load module_ctx, 0x8
2893+
v26:i64 = Iadd v25, v21
2894+
v27:i32 = Load v26, 0x15
28902895
Jump blk_ret
28912896
`,
28922897
},
@@ -2939,44 +2944,44 @@ blk0: (exec_ctx:i64, module_ctx:i64, v2:i32)
29392944
v8:i64 = Load module_ctx, 0x8
29402945
v9:i64 = Iadd v8, v4
29412946
v10:i32 = Load v9, 0x10
2942-
Jump blk1
2947+
Jump blk1, v2
29432948
2944-
blk1: () <-- (blk0,blk6)
2945-
v11:i64 = Iconst_64 0x24
2946-
v12:i64 = UExtend v2, 32->64
2947-
v13:i64 = Uload32 module_ctx, 0x10
2948-
v14:i64 = Iadd v12, v11
2949-
v15:i32 = Icmp lt_u, v13, v14
2950-
ExitIfTrue v15, exec_ctx, memory_out_of_bounds
2951-
v16:i64 = Load module_ctx, 0x8
2952-
v17:i64 = Iadd v16, v12
2953-
v18:i32 = Load v17, 0x20
2954-
Brz v18, blk4
2949+
blk1: (v11:i32) <-- (blk0,blk6)
2950+
v12:i64 = Iconst_64 0x24
2951+
v13:i64 = UExtend v11, 32->64
2952+
v14:i64 = Uload32 module_ctx, 0x10
2953+
v15:i64 = Iadd v13, v12
2954+
v16:i32 = Icmp lt_u, v14, v15
2955+
ExitIfTrue v16, exec_ctx, memory_out_of_bounds
2956+
v17:i64 = Load module_ctx, 0x8
2957+
v18:i64 = Iadd v17, v13
2958+
v19:i32 = Load v18, 0x20
2959+
Brz v19, blk4
29552960
Jump blk3
29562961
29572962
blk2: ()
29582963
29592964
blk3: () <-- (blk1)
2960-
Jump blk6
2965+
Jump blk6, v11
29612966
29622967
blk4: () <-- (blk1)
2963-
Brnz v2, blk_ret
2968+
Brnz v11, blk_ret
29642969
Jump blk9
29652970
29662971
blk5: () <-- (blk7,blk9)
29672972
Jump blk_ret
29682973
2969-
blk6: () <-- (blk3)
2970-
v19:i64 = Iconst_64 0x54
2971-
v20:i64 = UExtend v2, 32->64
2972-
v21:i64 = Uload32 module_ctx, 0x10
2973-
v22:i64 = Iadd v20, v19
2974-
v23:i32 = Icmp lt_u, v21, v22
2975-
ExitIfTrue v23, exec_ctx, memory_out_of_bounds
2976-
v24:i64 = Load module_ctx, 0x8
2977-
v25:i64 = Iadd v24, v20
2978-
v26:i32 = Load v25, 0x50
2979-
Brnz v26, blk1
2974+
blk6: (v20:i32) <-- (blk3)
2975+
v21:i64 = Iconst_64 0x54
2976+
v22:i64 = UExtend v20, 32->64
2977+
v23:i64 = Uload32 module_ctx, 0x10
2978+
v24:i64 = Iadd v22, v21
2979+
v25:i32 = Icmp lt_u, v23, v24
2980+
ExitIfTrue v25, exec_ctx, memory_out_of_bounds
2981+
v26:i64 = Load module_ctx, 0x8
2982+
v27:i64 = Iadd v26, v22
2983+
v28:i32 = Load v27, 0x50
2984+
Brnz v28, blk1, v20
29802985
Jump blk8
29812986
29822987
blk7: () <-- (blk8)

‎internal/engine/wazevo/frontend/lower.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,16 +1086,8 @@ func (c *Compiler) lowerCurrentOpcode() {
10861086
break
10871087
}
10881088
variable := c.localVariable(index)
1089-
if _, ok := c.m.NonStaticLocals[c.wasmLocalFunctionIndex][index]; ok {
1090-
state.push(builder.MustFindValue(variable))
1091-
} else {
1092-
// If a local is static, we can simply find it in the entry block which is either a function param
1093-
// or a zero value. This fast pass helps to avoid the overhead of searching the entire function plus
1094-
// avoid adding unnecessary block arguments.
1095-
// TODO: I think this optimization should be done in a SSA pass like passRedundantPhiEliminationOpt,
1096-
// but somehow there's some corner cases that it fails to optimize.
1097-
state.push(builder.MustFindValueInBlk(variable, c.ssaBuilder.EntryBlock()))
1098-
}
1089+
state.push(builder.MustFindValue(variable))
1090+
10991091
case wasm.OpcodeLocalSet:
11001092
index := c.readI32u()
11011093
if state.unreachable {

‎internal/engine/wazevo/ssa/builder.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@ type Builder interface {
5454
// MustFindValue searches the latest definition of the given Variable and returns the result.
5555
MustFindValue(variable Variable) Value
5656

57-
// MustFindValueInBlk is the same as MustFindValue except it searches the latest definition from the given BasicBlock.
58-
MustFindValueInBlk(variable Variable, blk BasicBlock) Value
59-
6057
// FindValueInLinearPath tries to find the latest definition of the given Variable in the linear path to the current BasicBlock.
6158
// If it cannot find the definition, or it's not sealed yet, it returns ValueInvalid.
6259
FindValueInLinearPath(variable Variable) Value
@@ -476,11 +473,6 @@ func (b *builder) findValueInLinearPath(variable Variable, blk *basicBlock) Valu
476473
return ValueInvalid
477474
}
478475

479-
func (b *builder) MustFindValueInBlk(variable Variable, blk BasicBlock) Value {
480-
typ := b.definedVariableType(variable)
481-
return b.findValue(typ, variable, blk.(*basicBlock))
482-
}
483-
484476
// MustFindValue implements Builder.MustFindValue.
485477
func (b *builder) MustFindValue(variable Variable) Value {
486478
typ := b.definedVariableType(variable)

‎internal/wasm/func_validation.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,6 @@ func (m *Module) validateFunctionWithMaxStackValues(
6767
declaredFunctionIndexes map[Index]struct{},
6868
br *bytes.Reader,
6969
) error {
70-
nonStaticLocals := make(map[Index]struct{})
71-
if len(m.NonStaticLocals) > 0 {
72-
m.NonStaticLocals[idx] = nonStaticLocals
73-
}
74-
7570
functionType := &m.TypeSection[m.FunctionSection[idx]]
7671
code := &m.CodeSection[idx]
7772
body := code.Body
@@ -357,7 +352,6 @@ func (m *Module) validateFunctionWithMaxStackValues(
357352
return fmt.Errorf("invalid local index for %s %d >= %d(=len(locals)+len(parameters))",
358353
OpcodeLocalSetName, index, l)
359354
}
360-
nonStaticLocals[index] = struct{}{}
361355
var expType ValueType
362356
if index < inputLen {
363357
expType = functionType.Params[index]
@@ -373,7 +367,6 @@ func (m *Module) validateFunctionWithMaxStackValues(
373367
return fmt.Errorf("invalid local index for %s %d >= %d(=len(locals)+len(parameters))",
374368
OpcodeLocalTeeName, index, l)
375369
}
376-
nonStaticLocals[index] = struct{}{}
377370
var expType ValueType
378371
if index < inputLen {
379372
expType = functionType.Params[index]

‎internal/wasm/module.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,6 @@ type Module struct {
185185
// as described in https://yurydelendik.github.io/webassembly-dwarf/, though it is not specified in the Wasm
186186
// specification: https://github.com/WebAssembly/debugging/issues/1
187187
DWARFLines *wasmdebug.DWARFLines
188-
189-
// NonStaticLocals collects the local indexes that will change its value through either local.get or local.tee.
190-
NonStaticLocals []map[Index]struct{}
191188
}
192189

193190
// ModuleID represents sha256 hash value uniquely assigned to Module.
@@ -366,8 +363,6 @@ func (m *Module) validateFunctions(enabledFeatures api.CoreFeatures, functions [
366363
br := bytes.NewReader(nil)
367364
// Also, we reuse the stacks across multiple function validations to reduce allocations.
368365
vs := &stacks{}
369-
// Non-static locals are gathered during validation and used in the down-stream compilation.
370-
m.NonStaticLocals = make([]map[Index]struct{}, len(m.FunctionSection))
371366
for idx, typeIndex := range m.FunctionSection {
372367
if typeIndex >= typeCount {
373368
return fmt.Errorf("invalid %s: type section index %d out of range", m.funcDesc(SectionIDFunction, Index(idx)), typeIndex)

0 commit comments

Comments
 (0)