Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make tests compatible with upstream llvm #2865

Merged
merged 1 commit into from
Dec 5, 2023
Merged

Conversation

Flakebi
Copy link
Member

@Flakebi Flakebi commented Dec 4, 2023

Allow the new disjoint flag on ors, which was recently added upstream.

@Flakebi Flakebi requested a review from a team as a code owner December 4, 2023 17:15
Allow the new disjoint flag on `or`s, which was recently added upstream.
@amdvlk-admin
Copy link

Test summary for commit 133b7a5

CTS tests (Failed: 0/138443)
  • Built with version 1.3.5.2
  • Ubuntu navi3x, Srdcvk
    • Passed: 35211/69228 (50.9%)
    • Failed: 0/69228 (0.0%)
    • Not Supported: 34017/69228 (49.1%)
    • Warnings: 0/69228 (0.0%)
    Ubuntu navi2x, Srdcvk
    • Passed: 35241/69215 (50.9%)
    • Failed: 0/69215 (0.0%)
    • Not Supported: 33974/69215 (49.1%)
    • Warnings: 0/69215 (0.0%)

@amdvlk-admin
Copy link

Test summary for commit 2099fa8

CTS tests (Failed: 0/138378)
  • Built with version 1.3.5.2
  • Ubuntu navi3x, Srdcvk
    • Passed: 35162/69163 (50.8%)
    • Failed: 0/69163 (0.0%)
    • Not Supported: 34001/69163 (49.2%)
    • Warnings: 0/69163 (0.0%)
    Ubuntu navi2x, Srdcvk
    • Passed: 35242/69215 (50.9%)
    • Failed: 0/69215 (0.0%)
    • Not Supported: 33973/69215 (49.1%)
    • Warnings: 0/69215 (0.0%)

Copy link
Member

@dstutt dstutt left a comment

Choose a reason for hiding this comment

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

These changes look ok

Some of the tests checks are auto-generated
Maybe that's ok though - once someone re-generates the checks there's a strong possibility that the llvm versions will be up-to-date.

@@ -21,7 +21,7 @@ void main()
// CHECK-NEXT: [[TMP0:%.*]] = call i64 @llvm.amdgcn.s.getpc()
// CHECK-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], -4294967296
// CHECK-NEXT: [[TMP2:%.*]] = zext i32 [[USERDATA0]] to i64
// CHECK-NEXT: [[TMP3:%.*]] = or i64 [[TMP1]], [[TMP2]]
// CHECK-NEXT: [[TMP3:%.*]] = or {{(disjoint )?}}i64 [[TMP1]], [[TMP2]]
Copy link
Member

Choose a reason for hiding this comment

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

This test has auto-generated checks - presumably the optional disjoint will get changed if that's run?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, once llvm is updated and someone regenerates the test, these will be made permanent :)

@@ -85,7 +85,7 @@ attribute[0].offset = 0
; SHADERTEST-NEXT: [[DOTI1:%.*]] = fptosi float [[TMP19]] to i32
; SHADERTEST-NEXT: [[TMP12:%.*]] = and i64 [[TMP11]], -4294967296
; SHADERTEST-NEXT: [[TMP13:%.*]] = zext i32 [[DESCTABLE0:%.*]] to i64
; SHADERTEST-NEXT: [[TMP14:%.*]] = or i64 [[TMP12]], [[TMP13]]
; SHADERTEST-NEXT: [[TMP14:%.*]] = or {{(disjoint )?}}i64 [[TMP12]], [[TMP13]]
Copy link
Member

Choose a reason for hiding this comment

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

Also auto-generated

Copy link
Member

@dstutt dstutt left a comment

Choose a reason for hiding this comment

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

Ok - let's go with this approach with the tests.
I suppose this might actually be better than updating and disabling the test - and then re-enabling at some point when all the changes are propagated.

@Flakebi Flakebi merged commit 1005e28 into GPUOpen-Drivers:dev Dec 5, 2023
9 checks passed
@Flakebi Flakebi deleted the merge branch December 5, 2023 12:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants