Avoid `unwrap_or_else` in str indexing by tmiasko · Pull Request #75121 · rust-lang/rust

tmiasko · 2020-08-03T22:05:17Z

This provides a small reduction of generated LLVM IR, and leads to a
simpler assembly code.

This provides a small reduction of generated LLVM IR, and leads to a simpler assembly code.

rust-highfive · 2020-08-03T22:05:20Z

(rust_highfive has picked a reviewer for you, use r? to override)

Mark-Simulacrum · 2020-08-03T22:26:52Z

This really leads to simpler assembly with optimizations? That seems pretty unfortunate, given that this is essentially equivalent. Do you have diffs of before/after assembly?

tmiasko · 2020-08-03T23:12:32Z

The closure is not inlined but it needs to access slice, start index, and end index. For example:

pubfnsubstr(s:&str,a:usize,b:usize) -> &str{&s[a..b]}

cargo -Zbuild-std rustc --release --target x86_64-unknown-linux-gnu --lib -- --emit asm

Before

	.text	.file	"panic.8h59gtm7-cgu.0"	.section".text._ZN4core3str6traits101_$LT$impl$u20$core..slice..SliceIndex$LT$str$GT$$u20$for$u20$core..ops..range..Range$LT$usize$GT$$GT$5index28_$u7b$$u7b$closure$u7d$$u7d$17h75d822db790d87d2E","ax",@progbits	.p2align	4,0x90	.type	_ZN4core3str6traits101_$LT$impl$u20$core..slice..SliceIndex$LT$str$GT$$u20$for$u20$core..ops..range..Range$LT$usize$GT$$GT$5index28_$u7b$$u7b$closure$u7d$$u7d$17h75d822db790d87d2E,@function_ZN4core3str6traits101_$LT$impl$u20$core..slice..SliceIndex$LT$str$GT$$u20$for$u20$core..ops..range..Range$LT$usize$GT$$GT$5index28_$u7b$$u7b$closure$u7d$$u7d$17h75d822db790d87d2E:	.cfi_startproc	pushq	%rax	.cfi_def_cfa_offset 16movq	(%rdi), %rcxmovq8(%rdi), %rdxmovq	(%rcx), %raxmovq8(%rcx), %rsimovq	(%rdx), %rdxmovq16(%rdi), %rcxmovq	(%rcx), %rcx	leaq	.L__unnamed_1(%rip), %r8movq	%rax, %rdi	callq	*_ZN4core3str16slice_error_fail17he51ff928bfc853b6E@GOTPCREL(%rip)ud2.Lfunc_end0:	.size	_ZN4core3str6traits101_$LT$impl$u20$core..slice..SliceIndex$LT$str$GT$$u20$for$u20$core..ops..range..Range$LT$usize$GT$$GT$5index28_$u7b$$u7b$closure$u7d$$u7d$17h75d822db790d87d2E, .Lfunc_end0-_ZN4core3str6traits101_$LT$impl$u20$core..slice..SliceIndex$LT$str$GT$$u20$for$u20$core..ops..range..Range$LT$usize$GT$$GT$5index28_$u7b$$u7b$closure$u7d$$u7d$17h75d822db790d87d2E	.cfi_endproc	.section	.text._ZN5panic6substr17h2e99bd59166da18bE,"ax",@progbits	.globl	_ZN5panic6substr17h2e99bd59166da18bE	.p2align	4,0x90	.type	_ZN5panic6substr17h2e99bd59166da18bE,@function_ZN5panic6substr17h2e99bd59166da18bE:	.cfi_startproc	subq$56, %rsp	.cfi_def_cfa_offset 64movq	%rdi, %raxmovq	%rdi,16(%rsp)movq	%rsi,24(%rsp)movq	%rdx, (%rsp)movq	%rcx,8(%rsp)movq	%rcx, %rdi	subq	%rdx, %rdijb	.LBB1_10	testq	%rdx, %rdxje	.LBB1_2	cmpq	%rdx, %rsije	.LBB1_2jbe	.LBB1_10	cmpb	$-65, (%rax,%rdx)jle	.LBB1_10.LBB1_2:	testq	%rcx, %rcxje	.LBB1_6	cmpq	%rcx, %rsije	.LBB1_6jbe	.LBB1_10	cmpb	$-65, (%rax,%rcx)jle	.LBB1_10.LBB1_6:	addq	%rdx, %raxmovq	%rdi, %rdx	addq$56, %rsp	.cfi_def_cfa_offset 8	retq.LBB1_10:	.cfi_def_cfa_offset 64	leaq	16(%rsp), %raxmovq	%rax,32(%rsp)movq	%rsp, %raxmovq	%rax,40(%rsp)	leaq	8(%rsp), %raxmovq	%rax,48(%rsp)	leaq	32(%rsp), %rdi	callq	_ZN4core3str6traits101_$LT$impl$u20$core..slice..SliceIndex$LT$str$GT$$u20$for$u20$core..ops..range..Range$LT$usize$GT$$GT$5index28_$u7b$$u7b$closure$u7d$$u7d$17h75d822db790d87d2Eud2.Lfunc_end1:	.size	_ZN5panic6substr17h2e99bd59166da18bE, .Lfunc_end1-_ZN5panic6substr17h2e99bd59166da18bE	.cfi_endproc	.type	.L__unnamed_2,@object	.section	.rodata..L__unnamed_2,"a",@progbits.L__unnamed_2:	.ascii	"/home/tm/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/str/mod.rs"	.size	.L__unnamed_2,109	.type	.L__unnamed_1,@object	.section	.data.rel.ro..L__unnamed_1,"aw",@progbits	.p2align	3.L__unnamed_1:	.quad	.L__unnamed_2	.asciz	"m\000\000\000\000\000\000\000\206\007\000\000/\000\000"	.size	.L__unnamed_1,24	.section".note.GNU-stack","",@progbits

After

	.text	.file	"panic.8h59gtm7-cgu.0"	.section	.text._ZN5panic6substr17h2e99bd59166da18bE,"ax",@progbits	.globl	_ZN5panic6substr17h2e99bd59166da18bE	.p2align	4,0x90	.type	_ZN5panic6substr17h2e99bd59166da18bE,@function_ZN5panic6substr17h2e99bd59166da18bE:	.cfi_startproc	pushq	%rax	.cfi_def_cfa_offset 16movq	%rdi, %raxmovq	%rcx, %rdi	subq	%rdx, %rdijb	.LBB0_10	testq	%rdx, %rdxje	.LBB0_2	cmpq	%rdx, %rsije	.LBB0_2jbe	.LBB0_10	cmpb	$-65, (%rax,%rdx)jle	.LBB0_10.LBB0_2:	testq	%rcx, %rcxje	.LBB0_6	cmpq	%rcx, %rsije	.LBB0_6jbe	.LBB0_10	cmpb	$-65, (%rax,%rcx)jle	.LBB0_10.LBB0_6:	addq	%rdx, %raxmovq	%rdi, %rdx	popq	%rcx	.cfi_def_cfa_offset 8	retq.LBB0_10:	.cfi_def_cfa_offset 16	leaq	.L__unnamed_1(%rip), %r8movq	%rax, %rdi	callq	*_ZN4core3str16slice_error_fail17he51ff928bfc853b6E@GOTPCREL(%rip)ud2.Lfunc_end0:	.size	_ZN5panic6substr17h2e99bd59166da18bE, .Lfunc_end0-_ZN5panic6substr17h2e99bd59166da18bE	.cfi_endproc	.type	.L__unnamed_2,@object	.section	.rodata..L__unnamed_2,"a",@progbits.L__unnamed_2:	.ascii	"src/lib.rs"	.size	.L__unnamed_2,10	.type	.L__unnamed_1,@object	.section	.data.rel.ro..L__unnamed_1,"aw",@progbits	.p2align	3.L__unnamed_1:	.quad	.L__unnamed_2	.asciz	"\n\000\000\000\000\000\000\000\002\000\000\000\006\000\000"	.size	.L__unnamed_1,24	.section".note.GNU-stack","",@progbits

Diff

--- before.s	2020-08-04 01:00:06.506321119 +0200+++ after.s	2020-08-04 01:02:00.953935361 +0200@@ -1,91 +1,60 @@
.text
.file	"panic.8h59gtm7-cgu.0"
-	.section	".text._ZN4core3str6traits101_$LT$impl$u20$core..slice..SliceIndex$LT$str$GT$$u20$for$u20$core..ops..range..Range$LT$usize$GT$$GT$5index28_$u7b$$u7b$closure$u7d$$u7d$17h75d822db790d87d2E","ax",@progbits-	.p2align	4, 0x90-	.type	_ZN4core3str6traits101_$LT$impl$u20$core..slice..SliceIndex$LT$str$GT$$u20$for$u20$core..ops..range..Range$LT$usize$GT$$GT$5index28_$u7b$$u7b$closure$u7d$$u7d$17h75d822db790d87d2E,@function-_ZN4core3str6traits101_$LT$impl$u20$core..slice..SliceIndex$LT$str$GT$$u20$for$u20$core..ops..range..Range$LT$usize$GT$$GT$5index28_$u7b$$u7b$closure$u7d$$u7d$17h75d822db790d87d2E:-	.cfi_startproc-	pushq	%rax-	.cfi_def_cfa_offset 16-	movq	(%rdi), %rcx-	movq	8(%rdi), %rdx-	movq	(%rcx), %rax-	movq	8(%rcx), %rsi-	movq	(%rdx), %rdx-	movq	16(%rdi), %rcx-	movq	(%rcx), %rcx-	leaq	.L__unnamed_1(%rip), %r8-	movq	%rax, %rdi-	callq	*_ZN4core3str16slice_error_fail17he51ff928bfc853b6E@GOTPCREL(%rip)-	ud2-.Lfunc_end0:-	.size	_ZN4core3str6traits101_$LT$impl$u20$core..slice..SliceIndex$LT$str$GT$$u20$for$u20$core..ops..range..Range$LT$usize$GT$$GT$5index28_$u7b$$u7b$closure$u7d$$u7d$17h75d822db790d87d2E, .Lfunc_end0-_ZN4core3str6traits101_$LT$impl$u20$core..slice..SliceIndex$LT$str$GT$$u20$for$u20$core..ops..range..Range$LT$usize$GT$$GT$5index28_$u7b$$u7b$closure$u7d$$u7d$17h75d822db790d87d2E-	.cfi_endproc-
.section	.text._ZN5panic6substr17h2e99bd59166da18bE,"ax",@progbits
.globl	_ZN5panic6substr17h2e99bd59166da18bE
.p2align	4, 0x90
.type	_ZN5panic6substr17h2e99bd59166da18bE,@function
_ZN5panic6substr17h2e99bd59166da18bE:
.cfi_startproc
-	subq	$56, %rsp-	.cfi_def_cfa_offset 64+	pushq	%rax+	.cfi_def_cfa_offset 16
movq	%rdi, %rax
-	movq	%rdi, 16(%rsp)-	movq	%rsi, 24(%rsp)-	movq	%rdx, (%rsp)-	movq	%rcx, 8(%rsp)
movq	%rcx, %rdi
subq	%rdx, %rdi
-	jb	.LBB1_10+	jb	.LBB0_10
testq	%rdx, %rdx
-	je	.LBB1_2+	je	.LBB0_2
cmpq	%rdx, %rsi
-	je	.LBB1_2-	jbe	.LBB1_10+	je	.LBB0_2+	jbe	.LBB0_10
cmpb	$-65, (%rax,%rdx)
-	jle	.LBB1_10-.LBB1_2:+	jle	.LBB0_10+.LBB0_2:
testq	%rcx, %rcx
-	je	.LBB1_6+	je	.LBB0_6
cmpq	%rcx, %rsi
-	je	.LBB1_6-	jbe	.LBB1_10+	je	.LBB0_6+	jbe	.LBB0_10
cmpb	$-65, (%rax,%rcx)
-	jle	.LBB1_10-.LBB1_6:+	jle	.LBB0_10+.LBB0_6:
addq	%rdx, %rax
movq	%rdi, %rdx
-	addq	$56, %rsp+	popq	%rcx
.cfi_def_cfa_offset 8
retq
-.LBB1_10:-	.cfi_def_cfa_offset 64-	leaq	16(%rsp), %rax-	movq	%rax, 32(%rsp)-	movq	%rsp, %rax-	movq	%rax, 40(%rsp)-	leaq	8(%rsp), %rax-	movq	%rax, 48(%rsp)-	leaq	32(%rsp), %rdi-	callq	_ZN4core3str6traits101_$LT$impl$u20$core..slice..SliceIndex$LT$str$GT$$u20$for$u20$core..ops..range..Range$LT$usize$GT$$GT$5index28_$u7b$$u7b$closure$u7d$$u7d$17h75d822db790d87d2E+.LBB0_10:+	.cfi_def_cfa_offset 16+	leaq	.L__unnamed_1(%rip), %r8+	movq	%rax, %rdi+	callq	*_ZN4core3str16slice_error_fail17he51ff928bfc853b6E@GOTPCREL(%rip)
ud2
-.Lfunc_end1:-	.size	_ZN5panic6substr17h2e99bd59166da18bE, .Lfunc_end1-_ZN5panic6substr17h2e99bd59166da18bE+.Lfunc_end0:+	.size	_ZN5panic6substr17h2e99bd59166da18bE, .Lfunc_end0-_ZN5panic6substr17h2e99bd59166da18bE
.cfi_endproc
.type	.L__unnamed_2,@object
.section	.rodata..L__unnamed_2,"a",@progbits
.L__unnamed_2:
-	.ascii	"/home/tm/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/str/mod.rs"-	.size	.L__unnamed_2, 109+	.ascii	"src/lib.rs"+	.size	.L__unnamed_2, 10
.type	.L__unnamed_1,@object
.section	.data.rel.ro..L__unnamed_1,"aw",@progbits
.p2align	3
.L__unnamed_1:
.quad	.L__unnamed_2
-	.asciz	"m\000\000\000\000\000\000\000\206\007\000\000/\000\000"+	.asciz	"\n\000\000\000\000\000\000\000\002\000\000\000\006\000\000"
.size	.L__unnamed_1, 24
.section	".note.GNU-stack","",@progbits

Please excuse me the unfortunate choice of "panic" as a crate name.

Mark-Simulacrum · 2020-08-03T23:37:12Z

@bors try @rust-timer queue

This does indeed look better - I guess LLVM is probably probably propagates the cold attribute on the panicking and decides not to inline, though in this case that's not a good idea.

rust-timer · 2020-08-03T23:37:14Z

Awaiting bors try build completion

bors · 2020-08-03T23:37:24Z

⌛ Trying commit 427634b with merge 0842550b7a5835c0f8b89613403e0b1cd220dd29...

erikdesjardins · 2020-08-03T23:43:57Z

This likely fixes #68874

bors · 2020-08-04T00:20:35Z

☀️ Try build successful - checks-actions, checks-azure
Build commit: 0842550b7a5835c0f8b89613403e0b1cd220dd29 (0842550b7a5835c0f8b89613403e0b1cd220dd29)

rust-timer · 2020-08-04T00:20:36Z

Queued 0842550b7a5835c0f8b89613403e0b1cd220dd29 with parent d8cbd9c, future comparison URL.

rust-timer · 2020-08-04T06:52:34Z

Finished benchmarking try commit (0842550b7a5835c0f8b89613403e0b1cd220dd29): 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

Mark-Simulacrum · 2020-08-04T11:44:45Z

@bors r+

bors · 2020-08-04T11:44:47Z

📌 Commit 427634b has been approved by Mark-Simulacrum

tesuji · 2020-08-04T11:53:09Z

I wonder if slice indexing has the same problem.
@tmiasko Do you want to file another PR to check that?

bors · 2020-08-04T13:17:41Z

⌛ Testing commit 427634b with merge 2c4c208ff90b7bde5a152255dc08d646f905283f...

bors · 2020-08-04T13:21:44Z

💔 Test failed - checks-actions

rust-log-analyzer · 2020-08-04T13:23:33Z

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

tmiasko · 2020-08-05T09:32:11Z

@erikdesjardins indeed this change brings the performance to the levels of split_at. Thanks for pointing that out.

The bors failure was a network error: fatal: unable to access 'https://github.com/rust-lang/cargo.git/': transfer closed with outstanding read data remaining.

ecstatic-morse · 2020-08-06T17:22:52Z

@bors retry

bors · 2020-08-06T17:24:08Z

⌛ Testing commit 427634b with merge 68194d1055513b250aaa5c20a1c928f974184089...

bors · 2020-08-06T18:26:46Z

💔 Test failed - checks-actions

ecstatic-morse · 2020-08-06T18:36:27Z

Different I/O failure on Android builder.

@bors retry

tmiasko · 2020-08-06T19:27:31Z

Looks like error from the last run was introduced by #75005 (test closes stdout).

error: io error when listing tests: Os { code: 107, kind: NotConnected, message: "Transport endpoint is not connected" }

EDIT: Fixed in #75228.

bors · 2020-08-06T20:13:51Z

⌛ Testing commit 427634b with merge 80e872f3c013c584982e5bc0d87434bbf29fa6eb...

ecstatic-morse · 2020-08-06T20:22:15Z

@bors retry

rust-log-analyzer · 2020-08-06T20:26:46Z

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

##[group]Run exit 1
exit 1
shell: /bin/bash --noprofile --norc -e -o pipefail {0}
##[endgroup]
##[error]Process completed with exit code 1.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

bors · 2020-08-07T04:51:09Z

⌛ Testing commit 427634b with merge 9892279...

bors · 2020-08-07T06:40:46Z

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing 9892279 to master...

ecstatic-morse · 2020-08-17T19:26:43Z

This was a small perf win, mostly in the encoding-opt benchmark. Nice work!

Avoid unwrap_or_else in str indexing
427634b
This provides a small reduction of generated LLVM IR, and leads to a simpler assembly code.

rust-highfive assigned withoutboats Aug 3, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 3, 2020

Mark-Simulacrum assigned Mark-Simulacrum and unassigned withoutboats Aug 3, 2020

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 Aug 4, 2020

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 Aug 4, 2020

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 6, 2020

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 6, 2020

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 Aug 6, 2020

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 Aug 6, 2020

tmiasko mentioned this pull request Aug 6, 2020
Keep stdout open in limit_vector_count test #75228
Merged

bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 7, 2020

bors merged commit 9892279 into rust-lang:masterAug 7, 2020

tmiasko deleted the str-slicing branch August 7, 2020 11:18

cuviper added this to the 1.47.0 milestone May 2, 2024

Uh oh!

Uh oh!

Conversation

tmiasko commented Aug 3, 2020• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Aug 3, 2020

Uh oh!

Mark-Simulacrum commented Aug 3, 2020

Uh oh!

tmiasko commented Aug 3, 2020

Uh oh!

Mark-Simulacrum commented Aug 3, 2020

Uh oh!

rust-timer commented Aug 3, 2020

Uh oh!

bors commented Aug 3, 2020

Uh oh!

erikdesjardins commented Aug 3, 2020

Uh oh!

bors commented Aug 4, 2020

Uh oh!

rust-timer commented Aug 4, 2020

Uh oh!

rust-timer commented Aug 4, 2020

Uh oh!

Mark-Simulacrum commented Aug 4, 2020

Uh oh!

bors commented Aug 4, 2020

Uh oh!

tesuji commented Aug 4, 2020

Uh oh!

bors commented Aug 4, 2020

Uh oh!

bors commented Aug 4, 2020

Uh oh!

rust-log-analyzer commented Aug 4, 2020

Uh oh!

tmiasko commented Aug 5, 2020

Uh oh!

ecstatic-morse commented Aug 6, 2020

Uh oh!

bors commented Aug 6, 2020

Uh oh!

bors commented Aug 6, 2020

Uh oh!

ecstatic-morse commented Aug 6, 2020

Uh oh!

tmiasko commented Aug 6, 2020• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Aug 6, 2020

Uh oh!

ecstatic-morse commented Aug 6, 2020

Uh oh!

rust-log-analyzer commented Aug 6, 2020

Uh oh!

bors commented Aug 7, 2020

Uh oh!

bors commented Aug 7, 2020

Uh oh!

ecstatic-morse commented Aug 17, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

tmiasko commented Aug 3, 2020•
edited
Loading

tmiasko commented Aug 6, 2020•
edited
Loading