Upgrade to measureme 9.0.0 by wesleywiser · Pull Request #77398 · rust-lang/rust

wesleywiser · 2020-10-01T12:37:13Z

I believe I did this correctly but there's still a reference to measureme@0.7.1 coming from rustc-ap-rustc_data_structures and I'm not sure how to resolve that.

r? @Mark-Simulacrum

We'll also need to deploy the new version of the tools on perf.rlo.

wesleywiser · 2020-10-01T12:37:35Z

cc @michaelwoerister

Mark-Simulacrum · 2020-10-01T14:03:01Z

I'm pretty sure we can ignore the ap stuff, the duplicate dep there doesn't really matter too much. I imagine the best bet is to deploy this on perf like we did with 0.7, where we run both and whichever works works? One additional bit might be that perf is actually depending on measureme directly these days for the in-browser rendering, so that might complicate things somewhat.

I can see a couple solutions:

Invest in a measureme-all or whatever library that depends on each version of measureme and parses things with the right version (so far we've not changed any of the resulting types I think, so that should work fairly easily)
Just switch perf.rlo to using .8 for the UI rendering and don't worry about breaking it for older commits

Mark-Simulacrum · 2020-10-03T19:04:31Z

@bors try @rust-timer queue

rust-timer · 2020-10-03T19:04:32Z

Awaiting bors try build completion

bors · 2020-10-03T19:04:43Z

⌛ Trying commit 4e8813fd9ef61348937d3d8cf0523240c96c3988 with merge 87affc7df6cfd30178b8d76557e59bfa505f602f...

bors · 2020-10-03T19:49:26Z

☀️ Try build successful - checks-actions, checks-azure
Build commit: 87affc7df6cfd30178b8d76557e59bfa505f602f (87affc7df6cfd30178b8d76557e59bfa505f602f)

rust-timer · 2020-10-03T19:49:27Z

Queued 87affc7df6cfd30178b8d76557e59bfa505f602f with parent 738d4a7, future comparison URL.

wesleywiser · 2020-10-03T20:39:53Z

Marking this as a draft since we have another measureme breaking change in progress.

rust-timer · 2020-10-03T23:40:55Z

Finished benchmarking try commit (87affc7df6cfd30178b8d76557e59bfa505f602f): 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

wesleywiser · 2020-10-08T01:03:05Z

This is ready for review.

Just switch perf.rlo to using .8 for the UI rendering and don't worry about breaking it for older commits

That seems ok to me. We typically don't make that many breaking changes to the on-disk format anymore. I think the last one was about 9 months ago.

Mark-Simulacrum · 2020-10-15T19:58:45Z

@bors try @rust-timer queue include=helloworld

Just a quick try for a single benchmark, no need to do a full collection.

rust-timer · 2020-10-15T19:58:46Z

Awaiting bors try build completion

bors · 2020-10-15T19:59:01Z

⌛ Trying commit edae23a8f50c90337ea93ba39a808e4a035a5cac with merge 87781d93a3879c9931bdafd98741f3a1d2c02191...

bors · 2020-10-15T20:42:54Z

☀️ Try build successful - checks-actions, checks-azure
Build commit: 87781d93a3879c9931bdafd98741f3a1d2c02191 (87781d93a3879c9931bdafd98741f3a1d2c02191)

rust-timer · 2020-10-15T20:42:56Z

Queued 87781d93a3879c9931bdafd98741f3a1d2c02191 with parent b5c9e24, future comparison URL.

rust-timer · 2020-10-16T03:58:29Z

Finished benchmarking try commit (87781d93a3879c9931bdafd98741f3a1d2c02191): 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

jonas-schievink · 2020-10-24T11:55:12Z

@bors treeclosed-

bors · 2020-10-24T11:55:21Z

⌛ Testing commit d84daa1a04f0d927b20caa60bbaab82e2856b3e4 with merge 427c4ae4ddf69632281f399566a64c6bab003f94...

bors · 2020-10-24T16:10:22Z

💥 Test timed out

rust-log-analyzer · 2020-10-24T16:16:44Z

The job aarch64-gnu of 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.

note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
command: "make"
stdout:
------------------------------------------
# We don't compile `opaque` with either optimizations or instrumentation.
LD_LIBRARY_PATH="/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights:/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0-bootstrap-tools/aarch64-unknown-linux-gnu/release/deps:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0/lib" '/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights -L /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights opaque.rs || exit 1
# Compile the test program with instrumentation
mkdir -p "/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights/prof_data_dir" || exit 1
LD_LIBRARY_PATH="/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights:/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0-bootstrap-tools/aarch64-unknown-linux-gnu/release/deps:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0/lib" '/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights -L /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights interesting.rs \
-Cprofile-generate="/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights/prof_data_dir" -O -Ccodegen-units=1 || exit 1
LD_LIBRARY_PATH="/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights:/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0-bootstrap-tools/aarch64-unknown-linux-gnu/release/deps:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0/lib" '/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights -L /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights main.rs -Cprofile-generate="/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights/prof_data_dir" -O || exit 1
# The argument below generates to the expected branch weights
LD_LIBRARY_PATH="/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights:/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib/rustlib/aarch64-unknown-linux-gnu/lib:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0-bootstrap-tools/aarch64-unknown-linux-gnu/release/deps:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0/lib" /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights/main aaaaaaaaaaaa2bbbbbbbbbbbb2bbbbbbbbbbbbbbbbcc || exit 1
"/checkout/obj/build/aarch64-unknown-linux-gnu/llvm/build/bin/llvm-profdata" merge \
-o "/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights/prof_data_dir/merged.profdata" \
"/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights/prof_data_dir" || exit 1
LD_LIBRARY_PATH="/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights:/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0-bootstrap-tools/aarch64-unknown-linux-gnu/release/deps:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0/lib" '/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights -L /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights interesting.rs \
-Cprofile-use="/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights/prof_data_dir/merged.profdata" -O \
-Ccodegen-units=1 --emit=llvm-ir || exit 1
cat "/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights/interesting.ll" | "/checkout/obj/build/aarch64-unknown-linux-gnu/llvm/build/bin/FileCheck" filecheck-patterns.txt
------------------------------------------
stderr:
------------------------------------------
------------------------------------------
filecheck-patterns.txt:5:8: error: CHECK: expected string not found in input
CHECK: define void @function_called_twice(i32 %c) {{.*}} !prof [[function_called_twice_id:![0-9]+]] {
<stdin>:1:1: note: scanning from here
<stdin>:1:1: note: scanning from here
; ModuleID = 'interesting.3a1fbbbh-cgu.0'
^
<stdin>:7:1: note: possible intended match here
define void @function_called_twice(i32 %c) unnamed_addr #0 {
Input file: <stdin>
Input file: <stdin>
Check file: filecheck-patterns.txt
-dump-input=help explains the following input dump.
Input was:
<<<<<<
<<<<<<
1: ; ModuleID = 'interesting.3a1fbbbh-cgu.0'
check:5'0 X~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ error: no match found
2: source_filename = "interesting.3a1fbbbh-cgu.0"
check:5'0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3: target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
check:5'0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4: target triple = "aarch64-unknown-linux-gnu"
check:5'0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5: check:5'0 ~
6: ; Function Attrs: noinline nonlazybind uwtable
check:5'0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
7: define void @function_called_twice(i32 %c) unnamed_addr #0 {
check:5'0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
check:5'1 ? possible intended match
8: start:
check:5'0 ~~~~~~
9: %0 = icmp eq i32 %c, 50
check:5'0 ~~~~~~~~~~~~~~~~~~~~~~~~
10: br i1 %0, label %bb2, label %bb1
check:5'0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
11: check:5'0 ~
12: bb1: ; preds = %start
check:5'0 ~~~~~~~~~~~~~~~~~~~~~
.
.
>>>>>>
>>>>>>
make: *** [Makefile:42: all] Error 1
------------------------------------------
failures:
[run-make] run-make-fulldeps/pgo-branch-weights
test result: FAILED. 211 passed; 1 failed; 7 ignored; 0 measured; 0 filtered out
command did not execute successfully: "/checkout/obj/build/aarch64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib/rustlib/aarch64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc" "--rustdoc-path" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustdoc" "--rust-demangler-path" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage0-tools-bin/rust-demangler" "--src-base" "/checkout/src/test/run-make-fulldeps" "--build-base" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps" "--stage-id" "stage2-aarch64-unknown-linux-gnu" "--mode" "run-make" "--target" "aarch64-unknown-linux-gnu" "--host" "aarch64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/aarch64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options -Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options -Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python3" "--lldb-python" "/usr/bin/python3" "--gdb" "/usr/bin/gdb" "--llvm-version" "11.0.0-rust-1.49.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 frontendopenmp fuzzmutate globalisel gtest gtest_main hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation 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 orcerror orcjit passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo riscvutils runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target testingsupport textapi transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info xray" "--cc" "cc" "--cxx" "c++" "--cflags" "-ffunction-sections -fdata-sections -fPIC" "--ar" "ar" "--llvm-bin-dir" "/checkout/obj/build/aarch64-unknown-linux-gnu/llvm/build/bin" "--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
Build completed unsuccessfully in 1:42:44
Build completed unsuccessfully in 1:42:44
== clock drift check ==
local time: Sat Oct 24 13:43:41 UTC 2020
network time: Fri, 23 Oct 2020 18:52:11 GMT
== end clock drift check ==
##[error]Process completed with exit code 1.
Terminate orphan process: pid (8663) (node)
Terminate orphan process: pid (8672) (python)

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)

jonas-schievink · 2020-10-24T16:27:46Z

@bors retry

bors · 2020-10-25T00:41:50Z

☔ The latest upstream changes (presumably #78334) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

wesleywiser · 2020-10-25T03:09:19Z

@bors r=Mark-Simulacrum

bors · 2020-10-25T03:09:21Z

📌 Commit 5ac5556 has been approved by Mark-Simulacrum

bors · 2020-10-25T04:48:43Z

⌛ Testing commit 5ac5556 with merge 17cc9b6...

bors · 2020-10-25T07:03:51Z

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 17cc9b6 to master...

wesleywiser · 2020-10-25T12:04:28Z

@Mark-Simulacrum Thanks for getting the perf.rlo side of this working so we could land it!

rust-highfive assigned Mark-Simulacrum Oct 1, 2020

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

wesleywiser marked this pull request as draft October 3, 2020 20:39

Mark-Simulacrum 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 Oct 4, 2020

wesleywiser force-pushed the measureme_0_8 branch from 4e8813f to 567c575Compare October 8, 2020 00:28

wesleywiser changed the title ~~Upgrade to measureme 0.8.0~~Upgrade to measureme 9.0.0Oct 8, 2020

wesleywiser marked this pull request as ready for review October 8, 2020 00:29

wesleywiser force-pushed the measureme_0_8 branch from 567c575 to edae23aCompare October 8, 2020 00:45

wesleywiser mentioned this pull request Oct 10, 2020
Profiler no longer works with measureme 9.0.0 boa-dev/boa#839
Closed

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 Oct 14, 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 Oct 24, 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 Oct 24, 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 Oct 24, 2020

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 25, 2020

Upgrade to measureme 9.0.0
5ac5556

wesleywiser force-pushed the measureme_0_8 branch from d84daa1 to 5ac5556Compare October 25, 2020 02:40

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 25, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 25, 2020

bors merged commit 17cc9b6 into rust-lang:masterOct 25, 2020

rustbot added this to the 1.49.0 milestone Oct 25, 2020

This was referenced Oct 26, 2020
Could not find .mm_profdata file rust-lang/measureme#135
Closed
Cut new releases? rust-lang/measureme#126
Closed

wesleywiser mentioned this pull request Nov 29, 2020
ICE with -Zself-profile-events #73593
Closed

Uh oh!

Uh oh!

Conversation

wesleywiser commented Oct 1, 2020

Uh oh!

wesleywiser commented Oct 1, 2020

Uh oh!

Mark-Simulacrum commented Oct 1, 2020

Uh oh!

Mark-Simulacrum commented Oct 3, 2020

Uh oh!

rust-timer commented Oct 3, 2020

Uh oh!

bors commented Oct 3, 2020

Uh oh!

bors commented Oct 3, 2020

Uh oh!

rust-timer commented Oct 3, 2020

Uh oh!

wesleywiser commented Oct 3, 2020

Uh oh!

rust-timer commented Oct 3, 2020

Uh oh!

wesleywiser commented Oct 8, 2020

Uh oh!

Mark-Simulacrum commented Oct 15, 2020

Uh oh!

rust-timer commented Oct 15, 2020

Uh oh!

bors commented Oct 15, 2020

Uh oh!

bors commented Oct 15, 2020

Uh oh!

rust-timer commented Oct 15, 2020

Uh oh!

rust-timer commented Oct 16, 2020

Uh oh!

jonas-schievink commented Oct 24, 2020

Uh oh!

bors commented Oct 24, 2020

Uh oh!

bors commented Oct 24, 2020

Uh oh!

rust-log-analyzer commented Oct 24, 2020

Uh oh!

jonas-schievink commented Oct 24, 2020

Uh oh!

bors commented Oct 25, 2020

Uh oh!

wesleywiser commented Oct 25, 2020

Uh oh!

bors commented Oct 25, 2020

Uh oh!

bors commented Oct 25, 2020

Uh oh!

bors commented Oct 25, 2020

Uh oh!

wesleywiser commented Oct 25, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants