[UpdateTestChecks][Bug41532] Add handle of basic block names.

[Whitney]

Summary

Fixed Bug 41532 - update_test_checks does not actually handle block names. Also rerun reassociate-after-unroll.ll.

[lebedev.ri]

llvm/test/Transforms/PhaseOrdering/reassociate-after-unroll.ll

1

Is that what the script produces?

[Whitney]

llvm/test/Transforms/PhaseOrdering/reassociate-after-unroll.ll

1

Do you mean this line, the original LIT test, or the modified LIT test?
The new changes are manually modified by me.

[lebedev.ri]

llvm/test/Transforms/PhaseOrdering/reassociate-after-unroll.ll

1

Ah, so it's https://bugs.llvm.org/show_bug.cgi?id=41532
But still, the solution is to just rerun the script when that happens,
otherwise these changes will simply be lost when it will be rerun.

[Whitney]

llvm/test/Transforms/PhaseOrdering/reassociate-after-unroll.ll

1

I will address the issue in the script at a later date and try to provide a fix for PR41532, but for now I have this test case failing unnecessarily in an out-of-tree target. So I’d like to proceed with the interim fix to the test case for the time being.

[MaskRay]

llvm/utils/UpdateTestChecks/common.py

139–143

I'm concerned that the % change will create a huge amount of diff.

Can you make the updated form only apply to labels?

142

IR_LABEL_RE = re.compile(r'^()([-\w\.]+)(:)$')

[Whitney]

llvm/utils/UpdateTestChecks/common.py

139–143

I am trying to figure out how to match all variables which doesn't have prefix "label".

[Whitney]

I cannot think of any clean way to identify labels, there are three ways that label can be:

1. at the start of a basic block.
2. follow by "label".
3. incoming blocks in phinode.

@MaskRay Do you feel strong to limit the change only to label? If so, can you give me some guidance on how to do it?

[MaskRay]

In D64819#1595798, @Whitney wrote:

I cannot think of any clean way to identify labels, there are three ways that label can be:

1. at the start of a basic block.
2. follow by "label".
3. incoming blocks in phinode.

@MaskRay Do you feel strong to limit the change only to label? If so, can you give me some guidance on how to do it?

It depends on how other reviewers think about it... If it is suggested keeping the diff minimum is a desired property, you probably have to parse phi and label constructs..

[Whitney]

It depends on how other reviewers think about it...

Any thoughts? I prefer to keep the script clean and simple, although the one time change to the LIT tests will not be minimal.

[nikic]

I'm not sure I see the value in this change in either implementation. Changing block names seem to be a pretty niche issue (haven't ever run into this myself) and I don't think handling them in update_test_checks is worth the churn it will cause.

[nikic]

Maybe this could be put behind a flag and only used in the few instances where it is needed?

[Whitney]

@nikic Thanks for the suggestion. I personally ran into the issue that reassociate-after-unroll.ll failed due to the different in basic block name, after modifying the O2 pass pipeline. And modifying the script, was the suggested way to solve the failure. I am willing to put this change behind a flag if that's preferred, but it maybe hard for user to know when to use the flag, or even know the existence of it.

[Whitney]

@nikic As suggested, I added a flag to decide if to generate basic block names as variables.

[MaskRay]

In D64819#1623506, @Whitney wrote:

@nikic As suggested, I added a flag to decide if to generate basic block names as variables.

There is still a great amount of diff. I am afraid this cannot be accepted. Can be hold off on this until block name changing becomes less niche?

llvm/test/Transforms/PhaseOrdering/reassociate-after-unroll.ll

 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; REQUIRES: powerpc-registered-target
 ; RUN: opt -mtriple=powerpc64le-unknown-unknown -O2 -S < %s | FileCheck %s
 ; RUN: opt -mtriple=powerpc64le-unknown-unknown -passes='default<O2>' -S < %s \
 ; RUN:   | FileCheck %s --check-prefix=NPM
 
 target datalayout = "e-m:e-i64:64-n32:64"
 target triple = "powerpc64le-unknown-linux-gnu"
 
 define dso_local i64 @func(i64 %blah, i64 %limit) #0 {
 ; CHECK-LABEL: @func(
-; CHECK-NEXT:  entry:
-; CHECK-NEXT:    [[CMP4:%.*]] = icmp eq i64 [[LIMIT:%.*]], 0
-; CHECK-NEXT:    br i1 [[CMP4]], label [[FOR_COND_CLEANUP:%.*]], label [[FOR_BODY_LR_PH:%.*]]
-; CHECK:       for.body.lr.ph:
-; CHECK-NEXT:    [[CONV:%.*]] = and i64 [[BLAH:%.*]], 4294967295
-; CHECK-NEXT:    [[TMP0:%.*]] = add i64 [[LIMIT]], -1
-; CHECK-NEXT:    [[XTRAITER:%.*]] = and i64 [[LIMIT]], 7
-; CHECK-NEXT:    [[TMP1:%.*]] = icmp ult i64 [[TMP0]], 7
-; CHECK-NEXT:    br i1 [[TMP1]], label [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA:%.*]], label [[FOR_BODY_LR_PH_NEW:%.*]]
-; CHECK:       for.body.lr.ph.new:
-; CHECK-NEXT:    [[UNROLL_ITER:%.*]] = sub i64 [[LIMIT]], [[XTRAITER]]
-; CHECK-NEXT:    br label [[FOR_BODY:%.*]]
-; CHECK:       for.cond.cleanup.loopexit.unr-lcssa:
-; CHECK-NEXT:    [[ADD_LCSSA_PH:%.*]] = phi i64 [ undef, [[FOR_BODY_LR_PH]] ], [ [[ADD_7:%.*]], [[FOR_BODY]] ]
-; CHECK-NEXT:    [[K_05_UNR:%.*]] = phi i64 [ 1, [[FOR_BODY_LR_PH]] ], [ [[AND:%.*]], [[FOR_BODY]] ]
-; CHECK-NEXT:    [[LCMP_MOD:%.*]] = icmp eq i64 [[XTRAITER]], 0
-; CHECK-NEXT:    br i1 [[LCMP_MOD]], label [[FOR_COND_CLEANUP]], label [[FOR_BODY_EPIL:%.*]]
-; CHECK:       for.body.epil:
-; CHECK-NEXT:    [[G_06_EPIL:%.*]] = phi i64 [ [[ADD_EPIL:%.*]], [[FOR_BODY_EPIL]] ], [ [[ADD_LCSSA_PH]], [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
-; CHECK-NEXT:    [[K_05_EPIL:%.*]] = phi i64 [ [[AND_EPIL:%.*]], [[FOR_BODY_EPIL]] ], [ [[K_05_UNR]], [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
-; CHECK-NEXT:    [[EPIL_ITER:%.*]] = phi i64 [ [[EPIL_ITER_SUB:%.*]], [[FOR_BODY_EPIL]] ], [ [[XTRAITER]], [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
-; CHECK-NEXT:    [[AND_EPIL]] = and i64 [[CONV]], [[K_05_EPIL]]
-; CHECK-NEXT:    [[ADD_EPIL]] = add i64 [[AND_EPIL]], [[G_06_EPIL]]
-; CHECK-NEXT:    [[EPIL_ITER_SUB]] = add i64 [[EPIL_ITER]], -1
-; CHECK-NEXT:    [[EPIL_ITER_CMP:%.*]] = icmp eq i64 [[EPIL_ITER_SUB]], 0
-; CHECK-NEXT:    br i1 [[EPIL_ITER_CMP]], label [[FOR_COND_CLEANUP]], label [[FOR_BODY_EPIL]], !llvm.loop !0
-; CHECK:       for.cond.cleanup:
-; CHECK-NEXT:    [[G_0_LCSSA:%.*]] = phi i64 [ undef, [[ENTRY:%.*]] ], [ [[ADD_LCSSA_PH]], [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ], [ [[ADD_EPIL]], [[FOR_BODY_EPIL]] ]
-; CHECK-NEXT:    ret i64 [[G_0_LCSSA]]
-; CHECK:       for.body:
-; CHECK-NEXT:    [[G_06:%.*]] = phi i64 [ undef, [[FOR_BODY_LR_PH_NEW]] ], [ [[ADD_7]], [[FOR_BODY]] ]
-; CHECK-NEXT:    [[K_05:%.*]] = phi i64 [ 1, [[FOR_BODY_LR_PH_NEW]] ], [ [[AND]], [[FOR_BODY]] ]
-; CHECK-NEXT:    [[NITER:%.*]] = phi i64 [ [[UNROLL_ITER]], [[FOR_BODY_LR_PH_NEW]] ], [ [[NITER_NSUB_7:%.*]], [[FOR_BODY]] ]
-; CHECK-NEXT:    [[AND]] = and i64 [[CONV]], [[K_05]]
-; CHECK-NEXT:    [[ADD:%.*]] = add i64 [[AND]], [[G_06]]
-; CHECK-NEXT:    [[ADD_1:%.*]] = add i64 [[AND]], [[ADD]]
-; CHECK-NEXT:    [[ADD_2:%.*]] = add i64 [[AND]], [[ADD_1]]
-; CHECK-NEXT:    [[ADD_3:%.*]] = add i64 [[AND]], [[ADD_2]]
-; CHECK-NEXT:    [[ADD_4:%.*]] = add i64 [[AND]], [[ADD_3]]
-; CHECK-NEXT:    [[ADD_5:%.*]] = add i64 [[AND]], [[ADD_4]]
-; CHECK-NEXT:    [[ADD_6:%.*]] = add i64 [[AND]], [[ADD_5]]
-; CHECK-NEXT:    [[ADD_7]] = add i64 [[AND]], [[ADD_6]]
-; CHECK-NEXT:    [[NITER_NSUB_7]] = add i64 [[NITER]], -8
-; CHECK-NEXT:    [[NITER_NCMP_7:%.*]] = icmp eq i64 [[NITER_NSUB_7]], 0
-; CHECK-NEXT:    br i1 [[NITER_NCMP_7]], label [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]], label [[FOR_BODY]]
+; CHECK-NEXT:  [[ENTRY:.*]]:
+; CHECK-NEXT:    %[[CMP4:.*]] = icmp eq i64 %[[LIMIT:.*]], 0
+; CHECK-NEXT:    br i1 %[[CMP4]], label %[[FOR_COND_CLEANUP:.*]], label %[[FOR_BODY_LR_PH:.*]]
+; CHECK:       [[FOR_BODY_LR_PH]]:
+; CHECK-NEXT:    %[[CONV:.*]] = and i64 %[[BLAH:.*]], 4294967295
+; CHECK-NEXT:    %[[TMP0:.*]] = add i64 %[[LIMIT]], -1
+; CHECK-NEXT:    %[[XTRAITER:.*]] = and i64 %[[LIMIT]], 7
+; CHECK-NEXT:    %[[TMP1:.*]] = icmp ult i64 %[[TMP0]], 7
+; CHECK-NEXT:    br i1 %[[TMP1]], label %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA:.*]], label %[[FOR_BODY_LR_PH_NEW:.*]]
+; CHECK:       [[FOR_BODY_LR_PH_NEW]]:
+; CHECK-NEXT:    %[[UNROLL_ITER:.*]] = sub i64 %[[LIMIT]], %[[XTRAITER]]
+; CHECK-NEXT:    br label %[[FOR_BODY:.*]]
+; CHECK:       [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]]:
+; CHECK-NEXT:    %[[ADD_LCSSA_PH:.*]] = phi i64 [ undef, %[[FOR_BODY_LR_PH]] ], [ %[[ADD_7:.*]], %[[FOR_BODY]] ]
+; CHECK-NEXT:    %[[K_05_UNR:.*]] = phi i64 [ 1, %[[FOR_BODY_LR_PH]] ], [ %[[AND:.*]], %[[FOR_BODY]] ]
+; CHECK-NEXT:    %[[LCMP_MOD:.*]] = icmp eq i64 %[[XTRAITER]], 0
+; CHECK-NEXT:    br i1 %[[LCMP_MOD]], label %[[FOR_COND_CLEANUP]], label %[[FOR_BODY_EPIL:.*]]
+; CHECK:       [[FOR_BODY_EPIL]]:
+; CHECK-NEXT:    %[[G_06_EPIL:.*]] = phi i64 [ %[[ADD_EPIL:.*]], %[[FOR_BODY_EPIL]] ], [ %[[ADD_LCSSA_PH]], %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
+; CHECK-NEXT:    %[[K_05_EPIL:.*]] = phi i64 [ %[[AND_EPIL:.*]], %[[FOR_BODY_EPIL]] ], [ %[[K_05_UNR]], %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
+; CHECK-NEXT:    %[[EPIL_ITER:.*]] = phi i64 [ %[[EPIL_ITER_SUB:.*]], %[[FOR_BODY_EPIL]] ], [ %[[XTRAITER]], %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
+; CHECK-NEXT:    %[[AND_EPIL]] = and i64 %[[CONV]], %[[K_05_EPIL]]
+; CHECK-NEXT:    %[[ADD_EPIL]] = add i64 %[[AND_EPIL]], %[[G_06_EPIL]]
+; CHECK-NEXT:    %[[EPIL_ITER_SUB]] = add i64 %[[EPIL_ITER]], -1
+; CHECK-NEXT:    %[[EPIL_ITER_CMP:.*]] = icmp eq i64 %[[EPIL_ITER_SUB]], 0
+; CHECK-NEXT:    br i1 %[[EPIL_ITER_CMP]], label %[[FOR_COND_CLEANUP]], label %[[FOR_BODY_EPIL]], !llvm.loop !0
+; CHECK:       [[FOR_COND_CLEANUP]]:
+; CHECK-NEXT:    %[[G_0_LCSSA:.*]] = phi i64 [ undef, %[[ENTRY]] ], [ %[[ADD_LCSSA_PH]], %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ], [ %[[ADD_EPIL]], %[[FOR_BODY_EPIL]] ]
+; CHECK-NEXT:    ret i64 %[[G_0_LCSSA]]
+; CHECK:       [[FOR_BODY]]:
+; CHECK-NEXT:    %[[G_06:.*]] = phi i64 [ undef, %[[FOR_BODY_LR_PH_NEW]] ], [ %[[ADD_7]], %[[FOR_BODY]] ]
+; CHECK-NEXT:    %[[K_05:.*]] = phi i64 [ 1, %[[FOR_BODY_LR_PH_NEW]] ], [ %[[AND]], %[[FOR_BODY]] ]
+; CHECK-NEXT:    %[[NITER:.*]] = phi i64 [ %[[UNROLL_ITER]], %[[FOR_BODY_LR_PH_NEW]] ], [ %[[NITER_NSUB_7:.*]], %[[FOR_BODY]] ]
+; CHECK-NEXT:    %[[AND]] = and i64 %[[CONV]], %[[K_05]]
+; CHECK-NEXT:    %[[ADD:.*]] = add i64 %[[AND]], %[[G_06]]
+; CHECK-NEXT:    %[[ADD_1:.*]] = add i64 %[[AND]], %[[ADD]]
+; CHECK-NEXT:    %[[ADD_2:.*]] = add i64 %[[AND]], %[[ADD_1]]
+; CHECK-NEXT:    %[[ADD_3:.*]] = add i64 %[[AND]], %[[ADD_2]]
+; CHECK-NEXT:    %[[ADD_4:.*]] = add i64 %[[AND]], %[[ADD_3]]
+; CHECK-NEXT:    %[[ADD_5:.*]] = add i64 %[[AND]], %[[ADD_4]]
+; CHECK-NEXT:    %[[ADD_6:.*]] = add i64 %[[AND]], %[[ADD_5]]
+; CHECK-NEXT:    %[[ADD_7]] = add i64 %[[AND]], %[[ADD_6]]
+; CHECK-NEXT:    %[[NITER_NSUB_7]] = add i64 %[[NITER]], -8
+; CHECK-NEXT:    %[[NITER_NCMP_7:.*]] = icmp eq i64 %[[NITER_NSUB_7]], 0
+; CHECK-NEXT:    br i1 %[[NITER_NCMP_7]], label %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]], label %[[FOR_BODY]]
 ;
 ; NPM-LABEL: @func(
-; NPM-NEXT:  entry:
-; NPM-NEXT:    [[CMP4:%.*]] = icmp eq i64 [[LIMIT:%.*]], 0
-; NPM-NEXT:    br i1 [[CMP4]], label [[FOR_COND_CLEANUP:%.*]], label [[FOR_BODY_LR_PH:%.*]]
-; NPM:       for.body.lr.ph:
-; NPM-NEXT:    [[CONV:%.*]] = and i64 [[BLAH:%.*]], 4294967295
-; NPM-NEXT:    [[TMP0:%.*]] = add i64 [[LIMIT]], -1
-; NPM-NEXT:    [[XTRAITER:%.*]] = and i64 [[LIMIT]], 7
-; NPM-NEXT:    [[TMP1:%.*]] = icmp ult i64 [[TMP0]], 7
-; NPM-NEXT:    br i1 [[TMP1]], label [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA:%.*]], label [[FOR_BODY_LR_PH_NEW:%.*]]
-; NPM:       for.body.lr.ph.new:
-; NPM-NEXT:    [[UNROLL_ITER:%.*]] = sub i64 [[LIMIT]], [[XTRAITER]]
-; NPM-NEXT:    [[AND_0:%.*]] = and i64 [[CONV]], 1
-; NPM-NEXT:    br label [[FOR_BODY:%.*]]
-; NPM:       for.cond.cleanup.loopexit.unr-lcssa:
-; NPM-NEXT:    [[ADD_LCSSA_PH:%.*]] = phi i64 [ undef, [[FOR_BODY_LR_PH]] ], [ [[ADD_7:%.*]], [[FOR_BODY]] ]
-; NPM-NEXT:    [[K_05_UNR:%.*]] = phi i64 [ 1, [[FOR_BODY_LR_PH]] ], [ [[AND_PHI:%.*]], [[FOR_BODY]] ]
-; NPM-NEXT:    [[LCMP_MOD:%.*]] = icmp eq i64 [[XTRAITER]], 0
-; NPM-NEXT:    br i1 [[LCMP_MOD]], label [[FOR_COND_CLEANUP]], label [[FOR_BODY_EPIL:%.*]]
-; NPM:       for.body.epil:
-; NPM-NEXT:    [[G_06_EPIL:%.*]] = phi i64 [ [[ADD_EPIL:%.*]], [[FOR_BODY_EPIL]] ], [ [[ADD_LCSSA_PH]], [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
-; NPM-NEXT:    [[K_05_EPIL:%.*]] = phi i64 [ [[AND_EPIL:%.*]], [[FOR_BODY_EPIL]] ], [ [[K_05_UNR]], [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
-; NPM-NEXT:    [[EPIL_ITER:%.*]] = phi i64 [ [[EPIL_ITER_SUB:%.*]], [[FOR_BODY_EPIL]] ], [ [[XTRAITER]], [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
-; NPM-NEXT:    [[AND_EPIL]] = and i64 [[CONV]], [[K_05_EPIL]]
-; NPM-NEXT:    [[ADD_EPIL]] = add i64 [[AND_EPIL]], [[G_06_EPIL]]
-; NPM-NEXT:    [[EPIL_ITER_SUB]] = add i64 [[EPIL_ITER]], -1
-; NPM-NEXT:    [[EPIL_ITER_CMP:%.*]] = icmp eq i64 [[EPIL_ITER_SUB]], 0
-; NPM-NEXT:    br i1 [[EPIL_ITER_CMP]], label [[FOR_COND_CLEANUP]], label [[FOR_BODY_EPIL]], !llvm.loop !0
-; NPM:       for.cond.cleanup:
-; NPM-NEXT:    [[G_0_LCSSA:%.*]] = phi i64 [ undef, [[ENTRY:%.*]] ], [ [[ADD_LCSSA_PH]], [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ], [ [[ADD_EPIL]], [[FOR_BODY_EPIL]] ]
-; NPM-NEXT:    ret i64 [[G_0_LCSSA]]
-; NPM:       for.body:
-; NPM-NEXT:    [[G_06:%.*]] = phi i64 [ undef, [[FOR_BODY_LR_PH_NEW]] ], [ [[ADD_7]], [[FOR_BODY_FOR_BODY_CRIT_EDGE:%.*]] ]
-; NPM-NEXT:    [[AND_PHI]] = phi i64 [ [[AND_0]], [[FOR_BODY_LR_PH_NEW]] ], [ [[AND_1:%.*]], [[FOR_BODY_FOR_BODY_CRIT_EDGE]] ]
-; NPM-NEXT:    [[NITER:%.*]] = phi i64 [ [[UNROLL_ITER]], [[FOR_BODY_LR_PH_NEW]] ], [ [[NITER_NSUB_7:%.*]], [[FOR_BODY_FOR_BODY_CRIT_EDGE]] ]
-; NPM-NEXT:    [[ADD:%.*]] = add i64 [[AND_PHI]], [[G_06]]
-; NPM-NEXT:    [[ADD_1:%.*]] = add i64 [[AND_PHI]], [[ADD]]
-; NPM-NEXT:    [[ADD_2:%.*]] = add i64 [[AND_PHI]], [[ADD_1]]
-; NPM-NEXT:    [[ADD_3:%.*]] = add i64 [[AND_PHI]], [[ADD_2]]
-; NPM-NEXT:    [[ADD_4:%.*]] = add i64 [[AND_PHI]], [[ADD_3]]
-; NPM-NEXT:    [[ADD_5:%.*]] = add i64 [[AND_PHI]], [[ADD_4]]
-; NPM-NEXT:    [[ADD_6:%.*]] = add i64 [[AND_PHI]], [[ADD_5]]
-; NPM-NEXT:    [[ADD_7]] = add i64 [[AND_PHI]], [[ADD_6]]
-; NPM-NEXT:    [[NITER_NSUB_7]] = add i64 [[NITER]], -8
-; NPM-NEXT:    [[NITER_NCMP_7:%.*]] = icmp eq i64 [[NITER_NSUB_7]], 0
-; NPM-NEXT:    br i1 [[NITER_NCMP_7]], label [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]], label [[FOR_BODY_FOR_BODY_CRIT_EDGE]]
-; NPM:       for.body.for.body_crit_edge:
-; NPM-NEXT:    [[AND_1]] = and i64 [[CONV]], [[AND_PHI]]
-; NPM-NEXT:    br label [[FOR_BODY]]
+; NPM-NEXT:  [[ENTRY:.*]]:
+; NPM-NEXT:    %[[CMP4:.*]] = icmp eq i64 %[[LIMIT:.*]], 0
+; NPM-NEXT:    br i1 %[[CMP4]], label %[[FOR_COND_CLEANUP:.*]], label %[[FOR_BODY_LR_PH:.*]]
+; NPM:       [[FOR_BODY_LR_PH]]:
+; NPM-NEXT:    %[[CONV:.*]] = and i64 %[[BLAH:.*]], 4294967295
+; NPM-NEXT:    %[[TMP0:.*]] = add i64 %[[LIMIT]], -1
+; NPM-NEXT:    %[[XTRAITER:.*]] = and i64 %[[LIMIT]], 7
+; NPM-NEXT:    %[[TMP1:.*]] = icmp ult i64 %[[TMP0]], 7
+; NPM-NEXT:    br i1 %[[TMP1]], label %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA:.*]], label %[[FOR_BODY_LR_PH_NEW:.*]]
+; NPM:       [[FOR_BODY_LR_PH_NEW]]:
+; NPM-NEXT:    %[[UNROLL_ITER:.*]] = sub i64 %[[LIMIT]], %[[XTRAITER]]
+; NPM-NEXT:    %[[AND_0:.*]] = and i64 %[[CONV]], 1
+; NPM-NEXT:    br label %[[FOR_BODY:.*]]
+; NPM:       [[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]]:
+; NPM-NEXT:    %[[ADD_LCSSA_PH:.*]] = phi i64 [ undef, %[[FOR_BODY_LR_PH]] ], [ %[[ADD_7:.*]], %[[FOR_BODY]] ]
+; NPM-NEXT:    %[[K_05_UNR:.*]] = phi i64 [ 1, %[[FOR_BODY_LR_PH]] ], [ %[[AND_PHI:.*]], %[[FOR_BODY]] ]
+; NPM-NEXT:    %[[LCMP_MOD:.*]] = icmp eq i64 %[[XTRAITER]], 0
+; NPM-NEXT:    br i1 %[[LCMP_MOD]], label %[[FOR_COND_CLEANUP]], label %[[FOR_BODY_EPIL:.*]]
+; NPM:       [[FOR_BODY_EPIL]]:
+; NPM-NEXT:    %[[G_06_EPIL:.*]] = phi i64 [ %[[ADD_EPIL:.*]], %[[FOR_BODY_EPIL]] ], [ %[[ADD_LCSSA_PH]], %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
+; NPM-NEXT:    %[[K_05_EPIL:.*]] = phi i64 [ %[[AND_EPIL:.*]], %[[FOR_BODY_EPIL]] ], [ %[[K_05_UNR]], %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
+; NPM-NEXT:    %[[EPIL_ITER:.*]] = phi i64 [ %[[EPIL_ITER_SUB:.*]], %[[FOR_BODY_EPIL]] ], [ %[[XTRAITER]], %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ]
+; NPM-NEXT:    %[[AND_EPIL]] = and i64 %[[CONV]], %[[K_05_EPIL]]
+; NPM-NEXT:    %[[ADD_EPIL]] = add i64 %[[AND_EPIL]], %[[G_06_EPIL]]
+; NPM-NEXT:    %[[EPIL_ITER_SUB]] = add i64 %[[EPIL_ITER]], -1
+; NPM-NEXT:    %[[EPIL_ITER_CMP:.*]] = icmp eq i64 %[[EPIL_ITER_SUB]], 0
+; NPM-NEXT:    br i1 %[[EPIL_ITER_CMP]], label %[[FOR_COND_CLEANUP]], label %[[FOR_BODY_EPIL]], !llvm.loop !0
+; NPM:       [[FOR_COND_CLEANUP]]:
+; NPM-NEXT:    %[[G_0_LCSSA:.*]] = phi i64 [ undef, %[[ENTRY]] ], [ %[[ADD_LCSSA_PH]], %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]] ], [ %[[ADD_EPIL]], %[[FOR_BODY_EPIL]] ]
+; NPM-NEXT:    ret i64 %[[G_0_LCSSA]]
+; NPM:       [[FOR_BODY]]:
+; NPM-NEXT:    %[[G_06:.*]] = phi i64 [ undef, %[[FOR_BODY_LR_PH_NEW]] ], [ %[[ADD_7]], %[[FOR_BODY_FOR_BODY_CRIT_EDGE:.*]] ]
+; NPM-NEXT:    %[[AND_PHI]] = phi i64 [ %[[AND_0]], %[[FOR_BODY_LR_PH_NEW]] ], [ %[[AND_1:.*]], %[[FOR_BODY_FOR_BODY_CRIT_EDGE]] ]
+; NPM-NEXT:    %[[NITER:.*]] = phi i64 [ %[[UNROLL_ITER]], %[[FOR_BODY_LR_PH_NEW]] ], [ %[[NITER_NSUB_7:.*]], %[[FOR_BODY_FOR_BODY_CRIT_EDGE]] ]
+; NPM-NEXT:    %[[ADD:.*]] = add i64 %[[AND_PHI]], %[[G_06]]
+; NPM-NEXT:    %[[ADD_1:.*]] = add i64 %[[AND_PHI]], %[[ADD]]
+; NPM-NEXT:    %[[ADD_2:.*]] = add i64 %[[AND_PHI]], %[[ADD_1]]
+; NPM-NEXT:    %[[ADD_3:.*]] = add i64 %[[AND_PHI]], %[[ADD_2]]
+; NPM-NEXT:    %[[ADD_4:.*]] = add i64 %[[AND_PHI]], %[[ADD_3]]
+; NPM-NEXT:    %[[ADD_5:.*]] = add i64 %[[AND_PHI]], %[[ADD_4]]
+; NPM-NEXT:    %[[ADD_6:.*]] = add i64 %[[AND_PHI]], %[[ADD_5]]
+; NPM-NEXT:    %[[ADD_7]] = add i64 %[[AND_PHI]], %[[ADD_6]]
+; NPM-NEXT:    %[[NITER_NSUB_7]] = add i64 %[[NITER]], -8
+; NPM-NEXT:    %[[NITER_NCMP_7:.*]] = icmp eq i64 %[[NITER_NSUB_7]], 0
+; NPM-NEXT:    br i1 %[[NITER_NCMP_7]], label %[[FOR_COND_CLEANUP_LOOPEXIT_UNR_LCSSA]], label %[[FOR_BODY_FOR_BODY_CRIT_EDGE]]
+; NPM:       [[FOR_BODY_FOR_BODY_CRIT_EDGE]]:
+; NPM-NEXT:    %[[AND_1]] = and i64 %[[CONV]], %[[AND_PHI]]
+; NPM-NEXT:    br label %[[FOR_BODY]]
 ;
 entry:
   %blah.addr = alloca i64, align 8
   %limit.addr = alloca i64, align 8
   %k = alloca i32, align 4
   %g = alloca i64, align 8
   %i = alloca i64, align 8
   store i64 %blah, i64* %blah.addr, align 8

llvm/utils/UpdateTestChecks/common.py

for prefix in prefixes:
       func_dict[prefix][func] = function_body(scrubbed_body, scrubbed_extra)
 
 ##### Generator of LLVM IR CHECK lines
 
 SCRUB_IR_COMMENT_RE = re.compile(r'\s*;.*')
 
 # Match things that look at identifiers, but only if they are followed by
 # spaces, commas, paren, or end of the string
-IR_VALUE_RE = re.compile(r'(\s+)%([\w\.\-]+?)([,\s\(\)]|\Z)')
+IR_VALUE_WITH_PERCENT_RE = re.compile(r'(\s+%)([\w\.\-]+?)([,\s\(\)]|\Z)')
+IR_VALUE_RE = re.compile(r'(\s+%)([\w\.\-]+?)([,\s\(\)]|\Z)')
+
+# Match things that end with colon
+IR_LABEL_RE = re.compile(r'^()([\w\.\-]+)(:)$')
 
 # Create a FileCheck variable name based on an IR name.
 def get_value_name(var):
   if var.isdigit():
     var = 'TMP' + var
   var = var.replace('.', '_')
   var = var.replace('-', '_')
   return var.upper()
 
 
 # Create a FileCheck variable from regex.
 def get_value_definition(var):
-  return '[[' + get_value_name(var) + ':%.*]]'
+  return '[[' + get_value_name(var) + ':.*]]'
 
 
 # Use a FileCheck variable.
 def get_value_use(var):
   return '[[' + get_value_name(var) + ']]'
 
 # Replace IR value defs and uses with FileCheck variables.
-def genericize_check_lines(lines, is_analyze):
+def genericize_check_lines(lines, is_analyze, gen_var_block_name):
   # This gets called for each match that occurs in
   # a line. We transform variables we haven't seen
   # into defs, and variables we have seen into uses.
   def transform_line_vars(match):
     var = match.group(2)
     if var in vars_seen:
       rv = get_value_use(var)
     else:
def genericize_check_lines(lines, is_analyze, gen_var_block_name):
   lines_with_def = []
 
   for i, line in enumerate(lines):
     # An IR variable named '%.' matches the FileCheck regex string.
     line = line.replace('%.', '%dot')
     # Ignore any comments, since the check lines will too.
     scrubbed_line = SCRUB_IR_COMMENT_RE.sub(r'', line)
     if is_analyze == False:
+      if gen_var_block_name == True:
         lines[i] =  IR_VALUE_RE.sub(transform_line_vars, scrubbed_line)
+        lines[i] =  IR_LABEL_RE.sub(transform_line_vars, lines[i])
+      else:
+        lines[i] =  IR_VALUE_WITH_PERCENT_RE.sub(transform_line_vars, scrubbed_line)
     else:
       lines[i] =  scrubbed_line
   return lines
 
 
-def add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, is_asm, is_analyze):
+def add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, is_asm, is_analyze, gen_var_block_name):
   printed_prefixes = []
   for p in prefix_list:
     checkprefixes = p[0]
     for checkprefix in checkprefixes:
       if checkprefix in printed_prefixes:
         break
       # TODO func_dict[checkprefix] may be None, '' or not exist.
       # Fix the call sites.
for checkprefix in checkprefixes:
       if is_asm == True:
         output_lines.append('%s %s:       %s' % (comment_marker, checkprefix, func_body[0]))
         for func_line in func_body[1:]:
           output_lines.append('%s %s-NEXT:  %s' % (comment_marker, checkprefix, func_line))
         break
 
       # For IR output, change all defs to FileCheck variables, so we're immune
       # to variable naming fashions.
-      func_body = genericize_check_lines(func_body, is_analyze)
+      func_body = genericize_check_lines(func_body, is_analyze, gen_var_block_name)
 
       # This could be selectively enabled with an optional invocation argument.
       # Disabled for now: better to check everything. Be safe rather than sorry.
 
       # Handle the first line of the function body as a special case because
       # it's often just noise (a useless asm comment or entry label).
       #if func_body[0].startswith("#") or func_body[0].startswith("entry:"):
       #  is_blank_line = True
for checkprefix in checkprefixes:
               comment_marker, checkprefix, func_line))
         is_blank_line = False
 
       # Add space between different check prefixes and also before the first
       # line of code in the test function.
       output_lines.append(comment_marker)
       break
 
-def add_ir_checks(output_lines, comment_marker, prefix_list, func_dict, func_name):
+def add_ir_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, gen_var_block_name):
   # Label format is based on IR string.
   check_label_format = '{} %s-LABEL: @%s('.format(comment_marker)
-  add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, False, False)
+  add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, False, False, gen_var_block_name)
 
 def add_analyze_checks(output_lines, comment_marker, prefix_list, func_dict, func_name):
   check_label_format = '{} %s-LABEL: \'%s\''.format(comment_marker)
-  add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, False, True)
+  add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, False, True, False)

llvm/utils/update_test_checks.py

def main():
   from argparse import RawTextHelpFormatter
   parser = argparse.ArgumentParser(description=__doc__, formatter_class=RawTextHelpFormatter)
   parser.add_argument('-v', '--verbose', action='store_true',
                       help='Show verbose output')
   parser.add_argument('--opt-binary', default='opt',
                       help='The opt binary used to generate the test case')
   parser.add_argument(
       '--function', help='The function in the test file to update')
+  parser.add_argument('--varblocknames', action='store_true',
+                      help='Generate basic block names as variables')
   parser.add_argument('tests', nargs='+')
   args = parser.parse_args()
 
   autogenerated_note = (ADVERT + 'utils/' + os.path.basename(__file__))
 
   opt_basename = os.path.basename(args.opt_binary)
   if not re.match(r'^opt(-\d+)?$', opt_basename):
     print('ERROR: Unexpected opt name: ' + opt_basename, file=sys.stderr)
for input_line in input_lines:
           continue
         if input_line.lstrip().startswith(';'):
           m = common.CHECK_RE.match(input_line)
           if not m or m.group(1) not in prefix_set:
             output_lines.append(input_line)
             continue
 
         # Print out the various check lines here.
-        common.add_ir_checks(output_lines, ';', prefix_list, func_dict, func_name)
+        common.add_ir_checks(output_lines, ';', prefix_list, func_dict, func_name, args.varblocknames)
         is_in_function_start = False
 
       if is_in_function:
         if common.should_add_line_to_output(input_line, prefix_set):
           # This input line of the function body will go as-is into the output.
           # Except make leading whitespace uniform: 2 spaces.
           input_line = common.SCRUB_LEADING_WHITESPACE_RE.sub(r'  ', input_line)
           output_lines.append(input_line)