Skip to content

Update cdb annotations for some debuginfo tests with cdb 10.0.26100.2161 - #133115

Merged
bors merged 4 commits into
rust-lang:masterfrom
jieyouxu:cdb
Nov 16, 2024
Merged

Update cdb annotations for some debuginfo tests with cdb 10.0.26100.2161#133115
bors merged 4 commits into
rust-lang:masterfrom
jieyouxu:cdb

Conversation

@jieyouxu

@jieyouxujieyouxu commented Nov 16, 2024

Copy link
Copy Markdown
Member

GitHub CI runners recently updated to Windows Server 2022 (20241113) which included Windows Software Development Kit version 10.1.26100.1742, which transitively shipped a cdb version 10.0.26100.2161.

This changed some cdb output, causing 3 debuginfo tests to fail (see #133107, https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/msvc.20update.20causing.20debuginfo.20failures):

tests\debuginfo\numeric-types.rs
tests\debuginfo\range-types.rs
tests\debuginfo\unit-type.rs

I updated cdb annotations for these 3 tests locally with a matching cdb version. However, I am not by any means a cdb expert nor debuginfo expert, I just reblessed the tests to match whatever the new cdb version produces to unblock the tree. It is certainly possible that debuginfo improved/regressed/both with the newer cdb version.

try-job: x86_64-msvc

@rustbot

Copy link
Copy Markdown
Collaborator

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbotrustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 16, 2024
@jieyouxu

Copy link
Copy Markdown
MemberAuthor

@bors try

@jieyouxujieyouxu added A-debuginfo Area: Debugging information in compiled programs (DWARF, PDB, etc.) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. O-windows-msvc Toolchain: MSVC, Operating system: Windows labels Nov 16, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 16, 2024
Update cdb annotations for some debuginfo tests with cdb `10.0.26100.2161`
GitHub CI runners [recently updated to Windows Server 2022 (20241113)](https://github.com/actions/runner-images/releases/tag/win22%2F20241113.3) which included Windows Software Development Kit version `10.1.26100.1742`, which transitively shipped a `cdb` version `10.0.26100.2161`.
This changed some cdb output, causing 3 debuginfo tests to fail:
```
tests\debuginfo\numeric-types.rs
tests\debuginfo\range-types.rs
tests\debuginfo\unit-type.rs
```
I reblessed these 3 tests locally with a matching `cdb` version. However, I am not by any means a cdb expert nor debuginfo expert, I just reblessed the tests to match whatever the new cdb version produces to unblock the tree.
try-job: x86_64-msvc
@bors

bors commented Nov 16, 2024

Copy link
Copy Markdown
Collaborator

⌛ Trying commit e70df09 with merge f0b30ab...


// cdb-only
//@ min-cdb-version: 10.0.18317.1001
//@ only-cdb

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remark: // cdb-only had no effect, but this test only contained cdb so this really doesn't change anything.

@ChrisDentonChrisDenton left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me if try comes back green

@jieyouxu

Copy link
Copy Markdown
MemberAuthor

Looks like they passed.

test [debuginfo-cdb] tests\debuginfo\numeric-types.rs ... ok
test [debuginfo-cdb] tests\debuginfo\range-types.rs ... ok
test [debuginfo-cdb] tests\debuginfo\unit-type.rs ... ok

@bors

bors commented Nov 16, 2024

Copy link
Copy Markdown
Collaborator

☀️ Try build successful - checks-actions
Build commit: f0b30ab (f0b30abab0ce27f5946baaa39dd1d7325e6f86c3)

@ChrisDenton

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Nov 16, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit e70df09 has been approved by ChrisDenton

It is now in the queue for this repository.

@bors

bors commented Nov 16, 2024

Copy link
Copy Markdown
Collaborator

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@borsbors 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 Nov 16, 2024
@jieyouxu

Copy link
Copy Markdown
MemberAuthor

@bors p=101 rollup=never

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 16, 2024
Update cdb annotations for some debuginfo tests with cdb `10.0.26100.2161`
GitHub CI runners [recently updated to Windows Server 2022 (20241113)](https://github.com/actions/runner-images/releases/tag/win22%2F20241113.3) which included Windows Software Development Kit version `10.1.26100.1742`, which transitively shipped a `cdb` version `10.0.26100.2161`.
This changed some cdb output, causing 3 debuginfo tests to fail (see rust-lang#133107, https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/msvc.20update.20causing.20debuginfo.20failures):
```
tests\debuginfo\numeric-types.rs
tests\debuginfo\range-types.rs
tests\debuginfo\unit-type.rs
```
I updated cdb annotations for these 3 tests locally with a matching `cdb` version. However, I am not by any means a cdb expert nor debuginfo expert, I just reblessed the tests to match whatever the new cdb version produces to unblock the tree. It is certainly possible that debuginfo improved/regressed/both with the newer cdb version.
try-job: x86_64-msvc
@bors

bors commented Nov 16, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e70df09 with merge f6afd1b...

@rust-log-analyzer

This comment has been minimized.

@bors

bors commented Nov 16, 2024

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 16, 2024
@borsbors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 16, 2024
@jieyouxu

Copy link
Copy Markdown
MemberAuthor

Genuine failure

error: check directive(s) from `C:\a\rust\rust\tests\debuginfo\numeric-types.rs` not found in debugger output. errors:
(numeric-types.rs:86) ` [+0x000] __0 : 60 [Type: __int64]`
(numeric-types.rs:110) ` [+0x000] __0 : 0x78 [Type: unsigned __int64]`

@jieyouxu

Copy link
Copy Markdown
MemberAuthor

Of course, isize is different on 32-bit platforms

This is to unblock the tree, a proper fix will need to be investigated.
I think the debuginfo test suite supports revisions, however debugger
directives do not respect such revisions, which is problematic.
It's that 32-bit and 64-bit msvc of course have different integer widths
for `isize` and `usize`, meaning their underlying integer is different
and thus printed differently.
@jieyouxu

Copy link
Copy Markdown
MemberAuthor

I'm going to mark this integer debuginfo test as //@ only-64bit to unblock the queue, proper fix can be a follow-up.

@jieyouxu

Copy link
Copy Markdown
MemberAuthor

@bors r=@ChrisDenton

@bors

bors commented Nov 16, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit dccb6c0 has been approved by chrisdenton

It is now in the queue for this repository.

@borsbors 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 Nov 16, 2024
@bors

bors commented Nov 16, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit dccb6c0 with merge f2a3542...

@cuviper

Copy link
Copy Markdown
Member

Nominating because such environmental changes will probably affect beta and the 1.83 release too.

@rustbot label beta-nominated

@rustbotrustbot added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 16, 2024
@bors

bors commented Nov 16, 2024

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: chrisdenton
Pushing f2a3542 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Nov 16, 2024
@bors
bors merged commit f2a3542 into rust-lang:masterNov 16, 2024
@rustbotrustbot added this to the 1.84.0 milestone Nov 16, 2024
@saethlin

Copy link
Copy Markdown
Member

@bors treeclosed-

@Zalathar

Copy link
Copy Markdown
Member

I'm going to mark this integer debuginfo test as //@ only-64bit to unblock the queue, proper fix can be a follow-up.

Debuginfo commands used to support [rev], because they piggybacked on the main compiletest directive parser.

When I separated the debuginfo command parser from the compiletest directive parser in 1467dee, I didn't include revision support because it wasn't used by any tests that existed at the time.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (f2a3542): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

Results (primary 4.3%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

meanrangecount
Regressions ❌
(primary)
4.3%[4.3%, 4.3%]1
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)4.3%[4.3%, 4.3%]1

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 788.11s -> 788.713s (0.08%)
Artifact size: 335.43 MiB -> 335.43 MiB (-0.00%)

@jieyouxu
jieyouxu deleted the cdb branch November 17, 2024 06:45
@apiraino

Copy link
Copy Markdown
Contributor

Beta backport accepted as per compiler team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle.

@rustbot label +beta-accepted

@rustbotrustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 21, 2024
@cuvipercuviper mentioned this pull request Nov 21, 2024
@cuvipercuviper modified the milestones: 1.84.0, 1.83.0Nov 21, 2024
@cuvipercuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 21, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 22, 2024
[beta] backports
- Enforce that raw lifetimes must be valid raw identifiers rust-lang#132363
- Update cdb annotations for some debuginfo tests with cdb `10.0.26100.2161` rust-lang#133115
r? cuviper
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-debuginfoArea: Debugging information in compiled programs (DWARF, PDB, etc.)beta-acceptedAccepted for backporting to the compiler in the beta channel.merged-by-borsThis PR was explicitly merged by bors.O-windows-msvcToolchain: MSVC, Operating system: WindowsS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

11 participants

@jieyouxu@rustbot@bors@ChrisDenton@rust-log-analyzer@cuviper@saethlin@Zalathar@rust-timer@apiraino@Mark-Simulacrum