Optimize proc macro bridge#85390

Mark-Simulacrum · 2021-05-17T01:30:26Z

This optimizes the proc macro bridge code for a win of 0.7% instruction counts on the diesel-check benchmark (non-incr, full). These wins are small, but hopefully not limited to just the diesel benchmark; the code is also not seriously impacted by the changes here.

rust-highfive · 2021-05-17T01:30:29Z

r? @petrochenkov

(rust-highfive has picked a reviewer for you, use r? to override)

Mark-Simulacrum · 2021-05-17T01:30:57Z

@bors try @rust-timer queue

rust-timer · 2021-05-17T01:30:59Z

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

bors · 2021-05-17T01:31:07Z

⌛ Trying commit 4df5d58e6e7ca658565a0ffc9853cd791788ea29 with merge 55c4f6ccc851db7f04cd03a160665208bcaa65ea...

bors · 2021-05-17T02:31:28Z

☀️ Try build successful - checks-actions
Build commit: 55c4f6ccc851db7f04cd03a160665208bcaa65ea (55c4f6ccc851db7f04cd03a160665208bcaa65ea)

rust-timer · 2021-05-17T02:31:30Z

Queued 55c4f6ccc851db7f04cd03a160665208bcaa65ea with parent fe72845, future comparison URL.

rust-timer · 2021-05-17T06:59:18Z

Finished benchmarking try commit (55c4f6ccc851db7f04cd03a160665208bcaa65ea): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf

matklad · 2021-05-17T07:08:37Z

I don’t think adjustment on ra side is required, but we’ll want to port this over some day to keep the code identical. I wonder if we should look into sharing the impl here via a published crate, and not via copy-paste.

cc @edwin0cheng

library/proc_macro/src/bridge/buffer.rs

copy_from_slice generally falls back to memcpy/memmove, which is much more expensive than we need to write a single element in. This saves 0.26% instructions on the diesel benchmark.

This is a 0.15% win on diesel.

This allows a more efficient implementation (avoiding a fallback to memmove, which is not optimal for short writes). This saves 0.29% on diesel.

petrochenkov · 2021-05-29T17:47:57Z

@bors r+

bors · 2021-05-29T17:47:59Z

📌 Commit 8c20808 has been approved by petrochenkov

bors · 2021-05-29T18:53:19Z

⌛ Testing commit 8c20808 with merge 73f497f7caef0a3168037b452f46917b93c85590...

rust-log-analyzer · 2021-05-29T19:25:19Z

The job armhf-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)


------------------------------------------
stderr:
------------------------------------------
thread 'main' panicked at 'client.read_exact(&mut header) failed with Connection reset by peer (os error 104)', src/tools/remote-test-client/src/main.rs:310:9

------------------------------------------


---

Some tests failed in compiletest suite=ui mode=ui host=x86_64-unknown-linux-gnu target=arm-unknown-linux-gnueabihf


command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/arm-unknown-linux-gnueabihf/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-arm-unknown-linux-gnueabihf" "--suite" "ui" "--mode" "ui" "--target" "arm-unknown-linux-gnueabihf" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--linker" "arm-linux-gnueabihf-gcc" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/arm-unknown-linux-gnueabihf/native/rust-test-helpers" "--docck-python" "/usr/bin/python3" "--lldb-python" "/usr/bin/python3" "--llvm-version" "12.0.1-rust-1.54.0-nightly" "--llvm-components" "aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter cfguard codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker engine executionengine extensions filecheck frontendopenacc frontendopenmp fuzzmutate globalisel hellonew hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interfacestub interpreter ipo irreader jitlink libdriver lineeditor linker lto mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts object objectyaml option orcjit orcshared orctargetprocess passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target textapi transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info xray" "--cc" "" "--cxx" "" "--cflags" "" "--remote-test-client" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/remote-test-client" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"


failed to run: /checkout/obj/build/bootstrap/debug/bootstrap --stage 2 test --host= --target arm-unknown-linux-gnueabihf
Build completed unsuccessfully in 0:29:15

bors · 2021-05-29T19:27:34Z

💔 Test failed - checks-actions

Mark-Simulacrum · 2021-05-29T19:39:48Z

@bors retry thread 'main' panicked at 'client.read_exact(&mut header) failed with Connection reset by peer (os error 104)', src/tools/remote-test-client/src/main.rs:310:9

bors · 2021-05-29T22:55:44Z

⌛ Testing commit 8c20808 with merge 84b1005...

bors · 2021-05-30T01:21:34Z

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing 84b1005 to master...

eddyb · 2021-07-01T17:16:41Z

library/proc_macro/src/bridge/buffer.rs

    len: usize,
    capacity: usize,
-    extend_from_slice: extern "C" fn(Buffer<T>, Slice<'_, T>) -> Buffer<T>,
+    reserve: extern "C" fn(Buffer<T>, usize) -> Buffer<T>,


This is the last use of Slice and now Slice can be removed (not sure why it didn't warn/error as unused).

See rust-lang#85390 (comment)

proc_macro/bridge: Remove dead code Slice type See rust-lang#85390 (comment)

rust-highfive assigned petrochenkov May 17, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 17, 2021

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 17, 2021

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 17, 2021

petrochenkov reviewed May 23, 2021

View reviewed changes

library/proc_macro/src/bridge/buffer.rs Outdated Show resolved Hide resolved

library/proc_macro/src/bridge/buffer.rs Outdated Show resolved Hide resolved

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 23, 2021

Mark-Simulacrum added 3 commits May 29, 2021 12:45

Specialize single-element writes to buffer

299ac75

copy_from_slice generally falls back to memcpy/memmove, which is much more expensive than we need to write a single element in. This saves 0.26% instructions on the diesel benchmark.

Switch to reserve over extend_from_slice

92b2894

This is a 0.15% win on diesel.

Write primitive types via array buffers

8c20808

This allows a more efficient implementation (avoiding a fallback to memmove, which is not optimal for short writes). This saves 0.29% on diesel.

Mark-Simulacrum force-pushed the fast-bridge branch from 4df5d58 to 8c20808 Compare May 29, 2021 16:52

Mark-Simulacrum added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 29, 2021

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 29, 2021

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 29, 2021

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 29, 2021

bors added the merged-by-bors This PR was explicitly merged by bors. label May 30, 2021

bors merged commit 84b1005 into rust-lang:master May 30, 2021

rustbot added this to the 1.54.0 milestone May 30, 2021

cynecx added a commit to cynecx/rust-analyzer that referenced this pull request Jun 4, 2021

proc_macro_srv: apply more abi upstream changes (rust-lang/rust#85390)

ee7a5aa

cynecx added a commit to cynecx/rust-analyzer that referenced this pull request Jun 12, 2021

proc_macro_srv: apply more abi upstream changes (rust-lang/rust#85390)

a59e263

cynecx added a commit to cynecx/rust-analyzer that referenced this pull request Jun 20, 2021

proc_macro_srv: apply more abi upstream changes (rust-lang/rust#85390)

47e2f3a

eddyb reviewed Jul 1, 2021

View reviewed changes

lf- mentioned this pull request Jul 1, 2021

proc_macro/bridge: Remove dead code Slice type #86785

Merged

lf- added a commit to lf-/rust that referenced this pull request Jul 1, 2021

proc_macro/bridge: Remove dead code Slice type

0b3fedc

See rust-lang#85390 (comment)

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jul 1, 2021

Rollup merge of rust-lang#86785 - lf-:dead-code, r=Mark-Simulacrum

5d7a793

proc_macro/bridge: Remove dead code Slice type See rust-lang#85390 (comment)

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jul 1, 2021

Rollup merge of rust-lang#86785 - lf-:dead-code, r=Mark-Simulacrum

76bf7c0

proc_macro/bridge: Remove dead code Slice type See rust-lang#85390 (comment)

Uh oh!

Conversation

Mark-Simulacrum commented May 17, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented May 17, 2021

Uh oh!

Mark-Simulacrum commented May 17, 2021

Uh oh!

rust-timer commented May 17, 2021

Uh oh!

bors commented May 17, 2021

Uh oh!

bors commented May 17, 2021

Uh oh!

rust-timer commented May 17, 2021

Uh oh!

rust-timer commented May 17, 2021

Uh oh!

matklad commented May 17, 2021

Uh oh!

Uh oh!

Uh oh!

petrochenkov commented May 29, 2021

Uh oh!

bors commented May 29, 2021

Uh oh!

bors commented May 29, 2021

Uh oh!

rust-log-analyzer commented May 29, 2021

Uh oh!

bors commented May 29, 2021

Uh oh!

Mark-Simulacrum commented May 29, 2021

Uh oh!

bors commented May 29, 2021

Uh oh!

bors commented May 30, 2021

Uh oh!

eddyb Jul 1, 2021

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Mark-Simulacrum commented May 17, 2021 •

edited

Loading