This is an archive of the discontinued LLVM Phabricator instance.

Differential D120207

[ArgPromotion] Regenerate test checks for crash.ll – restored ALL_OLDPM prefix, add –allow-unused-prefixes.
ClosedPublic

Authored by vpykhtin on Feb 20 2022, 4:31 AM.

Details

Reviewers
mtrofin
jdoerfert
nikic
Commits
rG152325d2f3b6: [ArgPromotion] Regenerate test checks for crash.ll – restored ALL_OLDPM prefix,
rG52577cd26f26: [ArgPromotion] Regenerate test checks for crash.ll - removed ALL_NEWPM prefix.
Summary

This test has two runs that differ in what functions are left after the inliner, for example: barney exists on OLDPM path but don’t exist on NEWPM path. I restored prefixes this test had had after automatic checks were introduced for this test.




For now there are no checks left for ALL_NEWPM path, but the behavior seem to change over time so I added –allow-unused-prefixes to ease following check updates.






Renamed %tmp => %temp IR values to avoid update warning.
Diff Detail
Event Timeline
vpykhtin requested review of this revision.Feb 20 2022, 4:31 AM
vpykhtin created this revision.
Herald added a project: Restricted Project.  ·  View Herald TranscriptFeb 20 2022, 4:31 AM
Herald added a subscriber: llvm-commits.  ·  View Herald Transcript
Harbormaster completed remote builds in B150585: Diff 410142.Feb 20 2022, 5:19 AM
vpykhtin added a reviewer: nikic.Feb 20 2022, 10:39 PM
nikic accepted this revision.Feb 21 2022, 12:50 AM
LGTM
llvm/test/Transforms/ArgumentPromotion/crash.ll


2–3
If there's just one prefix left, we usually prefer switching it to the default CHECK.
This revision is now accepted and ready to land.Feb 21 2022, 12:50 AM
vpykhtin updated this revision to Diff 410311.Feb 21 2022, 8:10 AM
replaced ARGPROMOTION prefix with CHECK, renamed %tmp IR values to %temp to avoid update warnings like "WARNING: Change IR value name 'tmp1' or use --prefix-filecheck-ir-name to prevent possible conflict with scripted FileCheck name"
vpykhtin marked an inline comment as done.Feb 21 2022, 8:11 AM
This revision was landed with ongoing or failed builds.Feb 21 2022, 8:22 AM
Closed by commit rG52577cd26f26: [ArgPromotion] Regenerate test checks for crash.ll - removed ALL_NEWPM prefix. (authored by vpykhtin).  ·  Explain Why
This revision was automatically updated to reflect the committed changes.
vpykhtin added a commit: rG52577cd26f26: [ArgPromotion] Regenerate test checks for crash.ll - removed ALL_NEWPM prefix..
thakis added a subscriber: thakis.Feb 21 2022, 8:36 AM
This seems to break tests: http://45.33.8.238/linux/69178/step_12.txt



Please take a look and revert for now if it takes a while to fix.
Harbormaster completed remote builds in B150700: Diff 410311.Feb 21 2022, 8:51 AM
abrachet added a subscriber: abrachet.Feb 21 2022, 9:43 AM
Also seeing test failures here https://ci.chromium.org/ui/p/fuchsia/builders/toolchain.ci/clang-linux-x64/b8821601875696612705/overview
thakis added a comment.Feb 21 2022, 10:30 AM
reverted in c31ef42530713048e4b14d61e25b63af8d1084f8 for now
thakis added a reverting change: rGc31ef4253071: Revert "[ArgPromotion] Regenerate test checks for crash.ll - removed ALL_NEWPM….Feb 21 2022, 10:30 AM
vpykhtin reopened this revision.Feb 21 2022, 11:38 PM
Sorry for breaking the test, it turned out it has differences between two runs in what functions are left after the inliner, for example: barney exists on the first path but don’t exist on the second path.  This cannot be handled with a single CHECK prefix.
This revision is now accepted and ready to land.Feb 21 2022, 11:38 PM
vpykhtin updated this revision to Diff 410457.Feb 21 2022, 11:41 PM
vpykhtin retitled this revision from [ArgPromotion] Regenerate test checks for crash.ll - removed ALL_NEWPM prefix. to [ArgPromotion] Regenerate test checks for crash.ll – restored ALL_OLDPM prefix, add –allow-unused-prefixes..
vpykhtin edited the summary of this revision. (Show Details)
Fixed, updated description of the patch.
Harbormaster completed remote builds in B150815: Diff 410457.Feb 22 2022, 12:16 AM
This revision was landed with ongoing or failed builds.Feb 23 2022, 2:40 AM
Closed by commit rG152325d2f3b6: [ArgPromotion] Regenerate test checks for crash.ll – restored ALL_OLDPM prefix, (authored by vpykhtin).  ·  Explain Why
This revision was automatically updated to reflect the committed changes.
vpykhtin added a commit: rG152325d2f3b6: [ArgPromotion] Regenerate test checks for crash.ll – restored ALL_OLDPM prefix,.
Revision Contents
PathSize
llvm/
test/
Transforms/
ArgumentPromotion/
62 lines
Diff 410754
llvm/test/Transforms/ArgumentPromotion/crash.ll
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --function-signature --scrub-attributes
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --function-signature --scrub-attributes

; RUN: opt -S < %s -inline -argpromotion | FileCheck %s --check-prefix=ARGPROMOTION
; RUN: opt -S < %s -inline -argpromotion | FileCheck %s --check-prefixes=ARGPROMOTION,ALL_OLDPM --allow-unused-prefixes

; RUN: opt -S < %s -passes=inline,argpromotion | FileCheck %s --check-prefixes=ARGPROMOTION,ALL_NEWPM
; RUN: opt -S < %s -passes=inline,argpromotion | FileCheck %s --check-prefixes=ARGPROMOTION,ALL_NEWPM --allow-unused-prefixes

nikicUnsubmitted
Done
ReplyInline Actions
If there's just one prefix left, we usually prefer switching it to the default CHECK.
nikic: If there's just one prefix left, we usually prefer switching it to the default CHECK.



%S = type { %S* }
%S = type { %S* }




; Inlining should nuke the invoke (and any inlined calls) here even with
; Inlining should nuke the invoke (and any inlined calls) here even with

; argument promotion running along with it.
; argument promotion running along with it.

define void @zot() personality i32 (...)* @wibble {
define void @zot() personality i32 (...)* @wibble {

; ARGPROMOTION-LABEL: define {{[^@]+}}@zot() personality i32 (...)* @wibble
; ARGPROMOTION-LABEL: define {{[^@]+}}@zot() personality i32 (...)* @wibble {

; ARGPROMOTION-NEXT:  bb:
; ARGPROMOTION-NEXT:  bb:

; ARGPROMOTION-NEXT:    unreachable
; ARGPROMOTION-NEXT:    unreachable

; ARGPROMOTION:       hoge.exit:
; ARGPROMOTION:       hoge.exit:

; ARGPROMOTION-NEXT:    br label [[BB1:%.*]]
; ARGPROMOTION-NEXT:    br label [[BB1:%.*]]

; ARGPROMOTION:       bb1:
; ARGPROMOTION:       bb1:

; ARGPROMOTION-NEXT:    unreachable
; ARGPROMOTION-NEXT:    unreachable

; ARGPROMOTION:       bb2:
; ARGPROMOTION:       bb2:

; ARGPROMOTION-NEXT:    [[TMP:%.*]] = landingpad { i8*, i32 }
; ARGPROMOTION-NEXT:    [[TEMP:%.*]] = landingpad { i8*, i32 }

; ARGPROMOTION-NEXT:    cleanup
; ARGPROMOTION-NEXT:    cleanup

; ARGPROMOTION-NEXT:    unreachable
; ARGPROMOTION-NEXT:    unreachable

;
;

bb:
bb:

  invoke void @hoge()
  invoke void @hoge()

  to label %bb1 unwind label %bb2
  to label %bb1 unwind label %bb2




bb1:
bb1:

  unreachable
  unreachable




bb2:
bb2:

  %tmp = landingpad { i8*, i32 }
  %temp = landingpad { i8*, i32 }

  cleanup
  cleanup

  unreachable
  unreachable

}
}




define internal void @hoge() {
define internal void @hoge() {

bb:
bb:

  %tmp = call fastcc i8* @spam(i1 (i8*)* @eggs)
  %temp = call fastcc i8* @spam(i1 (i8*)* @eggs)

  %tmp1 = call fastcc i8* @spam(i1 (i8*)* @barney)
  %temp1 = call fastcc i8* @spam(i1 (i8*)* @barney)

  unreachable
  unreachable

}
}




define internal fastcc i8* @spam(i1 (i8*)* %arg) {
define internal fastcc i8* @spam(i1 (i8*)* %arg) {

bb:
bb:

  unreachable
  unreachable

}
}




define internal i1 @eggs(i8* %arg) {
define internal i1 @eggs(i8* %arg) {

; ALL_NEWPM-LABEL: define {{[^@]+}}@eggs()
; ARGPROMOTION-LABEL: define {{[^@]+}}@eggs() {

; ALL_NEWPM-NEXT:  bb:
; ARGPROMOTION-NEXT:  bb:

; ALL_NEWPM-NEXT:    unreachable
; ARGPROMOTION-NEXT:    unreachable

;
;

bb:
bb:

  %tmp = call zeroext i1 @barney(i8* %arg)
  %temp = call zeroext i1 @barney(i8* %arg)

  unreachable
  unreachable

}
}




define internal i1 @barney(i8* %arg) {
define internal i1 @barney(i8* %arg) {

; ALL_OLDPM-LABEL: define {{[^@]+}}@barney() {

; ALL_OLDPM-NEXT:  bb:

; ALL_OLDPM-NEXT:    ret i1 undef

;

bb:
bb:

  ret i1 undef
  ret i1 undef

}
}




define i32 @test_inf_promote_caller(i32 %arg) {
define i32 @test_inf_promote_caller(i32 %arg) {

; ARGPROMOTION-LABEL: define {{[^@]+}}@test_inf_promote_caller
; ARGPROMOTION-LABEL: define {{[^@]+}}@test_inf_promote_caller

; ARGPROMOTION-SAME: (i32 [[ARG:%.*]])
; ARGPROMOTION-SAME: (i32 [[ARG:%.*]]) {

; ARGPROMOTION-NEXT:  bb:
; ARGPROMOTION-NEXT:  bb:

; ARGPROMOTION-NEXT:    [[TMP:%.*]] = alloca [[S:%.*]]
; ARGPROMOTION-NEXT:    [[TEMP:%.*]] = alloca [[S:%.*]], align 8

; ARGPROMOTION-NEXT:    [[TMP1:%.*]] = alloca [[S]]
; ARGPROMOTION-NEXT:    [[TEMP1:%.*]] = alloca [[S]], align 8

; ARGPROMOTION-NEXT:    [[TMP2:%.*]] = call i32 @test_inf_promote_callee(%S* [[TMP]], %S* [[TMP1]])
; ARGPROMOTION-NEXT:    [[TEMP2:%.*]] = call i32 @test_inf_promote_callee(%S* [[TEMP]], %S* [[TEMP1]])

; ARGPROMOTION-NEXT:    ret i32 0
; ARGPROMOTION-NEXT:    ret i32 0

;
;

bb:
bb:

  %tmp = alloca %S
  %temp = alloca %S

  %tmp1 = alloca %S
  %temp1 = alloca %S

  %tmp2 = call i32 @test_inf_promote_callee(%S* %tmp, %S* %tmp1)
  %temp2 = call i32 @test_inf_promote_callee(%S* %temp, %S* %temp1)




  ret i32 0
  ret i32 0

}
}




define internal i32 @test_inf_promote_callee(%S* %arg, %S* %arg1) {
define internal i32 @test_inf_promote_callee(%S* %arg, %S* %arg1) {

; ARGPROMOTION-LABEL: define {{[^@]+}}@test_inf_promote_callee
; ARGPROMOTION-LABEL: define {{[^@]+}}@test_inf_promote_callee

; ARGPROMOTION-SAME: (%S* [[ARG:%.*]], %S* [[ARG1:%.*]])
; ARGPROMOTION-SAME: (%S* [[ARG:%.*]], %S* [[ARG1:%.*]]) {

; ARGPROMOTION-NEXT:  bb:
; ARGPROMOTION-NEXT:  bb:

; ARGPROMOTION-NEXT:    [[TMP:%.*]] = getelementptr [[S:%.*]], %S* [[ARG1]], i32 0, i32 0
; ARGPROMOTION-NEXT:    [[TEMP:%.*]] = getelementptr [[S:%.*]], %S* [[ARG1]], i32 0, i32 0

; ARGPROMOTION-NEXT:    [[TMP2:%.*]] = load %S*, %S** [[TMP]]
; ARGPROMOTION-NEXT:    [[TEMP2:%.*]] = load %S*, %S** [[TEMP]], align 8

; ARGPROMOTION-NEXT:    [[TMP3:%.*]] = getelementptr [[S]], %S* [[ARG]], i32 0, i32 0
; ARGPROMOTION-NEXT:    [[TEMP3:%.*]] = getelementptr [[S]], %S* [[ARG]], i32 0, i32 0

; ARGPROMOTION-NEXT:    [[TMP4:%.*]] = load %S*, %S** [[TMP3]]
; ARGPROMOTION-NEXT:    [[TEMP4:%.*]] = load %S*, %S** [[TEMP3]], align 8

; ARGPROMOTION-NEXT:    [[TMP5:%.*]] = call i32 @test_inf_promote_callee(%S* [[TMP4]], %S* [[TMP2]])
; ARGPROMOTION-NEXT:    [[TEMP5:%.*]] = call i32 @test_inf_promote_callee(%S* [[TEMP4]], %S* [[TEMP2]])

; ARGPROMOTION-NEXT:    ret i32 0
; ARGPROMOTION-NEXT:    ret i32 0

;
;

bb:
bb:

  %tmp = getelementptr %S, %S* %arg1, i32 0, i32 0
  %temp = getelementptr %S, %S* %arg1, i32 0, i32 0

  %tmp2 = load %S*, %S** %tmp
  %temp2 = load %S*, %S** %temp

  %tmp3 = getelementptr %S, %S* %arg, i32 0, i32 0
  %temp3 = getelementptr %S, %S* %arg, i32 0, i32 0

  %tmp4 = load %S*, %S** %tmp3
  %temp4 = load %S*, %S** %temp3

  %tmp5 = call i32 @test_inf_promote_callee(%S* %tmp4, %S* %tmp2)
  %temp5 = call i32 @test_inf_promote_callee(%S* %temp4, %S* %temp2)




  ret i32 0
  ret i32 0

}
}




declare i32 @wibble(...)
declare i32 @wibble(...)