Commit 9f262a01 authored by Michael Kruse's avatar Michael Kruse
Browse files

Fix most tests

parent 66bb6c98

clang/lib/CodeGen/CGLoopInfo.cpp

+5 −5
Original line number Diff line number Diff line
@@ -1158,19 +1158,19 @@ LoopInfoStack::applyFission(const LoopTransformation &Transform, 
  Orig->markDisableHeuristic();

  Orig->markNondefault();

  Orig->addTransformMD(MDNode::get(

      Ctx, {MDString::get(Ctx, "llvm.loop.fission.enable"),

      Ctx, {MDString::get(Ctx, "llvm.loop.distribute.enable"),

            ConstantAsMetadata::get(ConstantInt::get(Ctx, APInt(1, 1)))}));

  addDebugLoc(Ctx, "llvm.loop.fission.loc", Transform, Orig);

  addDebugLoc(Ctx, "llvm.loop.distribute.loc", Transform, Orig);

  if (Autofission) {

    Orig->addTransformMD(MDNode::get(

        Ctx, {MDString::get(Ctx, "llvm.loop.fission.autofission"),

        Ctx, {MDString::get(Ctx, "llvm.loop.distribute.autofission"),

              ConstantAsMetadata::get(ConstantInt::get(Ctx, APInt(1, 1)))}));

  }



  if (SplitAt.size()) {

    SmallVector<Metadata *> SplitAtInfo;

    SplitAtInfo.reserve(SplitAt.size() + 1);

    SplitAtInfo.push_back(MDString::get(Ctx, "llvm.loop.fission.split_at"));

    SplitAtInfo.push_back(MDString::get(Ctx, "llvm.loop.distribute.split_at"));

    for (auto x : SplitAt) {

      SplitAtInfo.push_back(

          ConstantAsMetadata::get(ConstantInt::get(Ctx, APInt(64, x))));
@@ -1193,7 +1193,7 @@ LoopInfoStack::applyFission(const LoopTransformation &Transform, 
      Fissioned->addAttribute(X);

    }



    Orig->addFollowup("llvm.loop.fission.followup_fissioned", Fissioned);

    Orig->addFollowup("llvm.loop.distribute.followup_distributed", Fissioned);



    if (!FissionedId.empty()) {

      Fissioned->addTransformMD(

clang/test/TransformPragma/pragma-id-fission-fission.c

+5 −5
Original line number Diff line number Diff line
@@ -56,14 +56,14 @@ int main() { 
// IR: !2 = distinct !{!2, !3, !4, !5, !6, !7}

// IR: !3 = !{!"llvm.loop.disable_nonforced"}

// IR: !4 = !{!"llvm.loop.id", !"i"}

// IR: !5 = !{!"llvm.loop.fission.enable", i1 true}

// IR: !6 = !{!"llvm.loop.fission.split_at", i64 1}

// IR: !7 = !{!"llvm.loop.fission.followup_fissioned", !8, !9}

// IR: !5 = !{!"llvm.loop.distribute.enable", i1 true}

// IR: !6 = !{!"llvm.loop.distribute.split_at", i64 1}

// IR: !7 = !{!"llvm.loop.distribute.followup_distributed", !8, !9}

// IR: !8 = distinct !{!8, !3}

// IR: !9 = distinct !{!9, !3}

// IR: !10 = distinct !{!10, !3, !11, !5, !6, !12}

// IR: !11 = !{!"llvm.loop.id", !"j"}

// IR: !12 = !{!"llvm.loop.fission.followup_fissioned", !13, !14}

// IR: !12 = !{!"llvm.loop.distribute.followup_distributed", !13, !14}

// IR: !13 = distinct !{!13, !3}

// IR: !14 = distinct !{!14, !3}

clang/test/TransformPragma/pragma-id-fission-fuse.c

+3 −3
Original line number Diff line number Diff line
@@ -47,9 +47,9 @@ int main() { 
// IR: !2 = distinct !{!2, !3, !4, !5, !6, !7}

// IR: !3 = !{!"llvm.loop.disable_nonforced"}

// IR: !4 = !{!"llvm.loop.id", !"i"}

// IR: !5 = !{!"llvm.loop.fission.enable", i1 true}

// IR: !6 = !{!"llvm.loop.fission.split_at", i64 1}

// IR: !7 = !{!"llvm.loop.fission.followup_fissioned", !8, !15}

// IR: !5 = !{!"llvm.loop.distribute.enable", i1 true}

// IR: !6 = !{!"llvm.loop.distribute.split_at", i64 1}

// IR: !7 = !{!"llvm.loop.distribute.followup_distributed", !8, !15}

// IR: !8 = distinct !{!8, !3, !9, !10, !11, !13}

// IR: !9 = !{!"llvm.loop.id", !"a"}

// IR: !10 = !{!"llvm.loop.fuse.enable", i1 true}

clang/test/TransformPragma/pragma-id-fission-reverse.c

+3 −3
Original line number Diff line number Diff line
@@ -49,9 +49,9 @@ int main() { 
// IR: !2 = distinct !{!2, !3, !4, !5, !6, !7}

// IR: !3 = !{!"llvm.loop.disable_nonforced"}

// IR: !4 = !{!"llvm.loop.id", !"i"}

// IR: !5 = !{!"llvm.loop.fission.enable", i1 true}

// IR: !6 = !{!"llvm.loop.fission.split_at", i64 1}

// IR: !7 = !{!"llvm.loop.fission.followup_fissioned", !8, !11}

// IR: !5 = !{!"llvm.loop.distribute.enable", i1 true}

// IR: !6 = !{!"llvm.loop.distribute.split_at", i64 1}

// IR: !7 = !{!"llvm.loop.distribute.followup_distributed", !8, !11}

// IR: !8 = distinct !{!8, !3, !9, !10}

// IR: !9 = !{!"llvm.loop.id", !"a"}

// IR: !10 = !{!"llvm.loop.reverse.enable", i1 true}

clang/test/TransformPragma/pragma-id-fission.c

+3 −3
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ int main() { 
// IR: !2 = distinct !{!2, !3, !4, !5, !6, !7}

// IR: !3 = !{!"llvm.loop.disable_nonforced"}

// IR: !4 = !{!"llvm.loop.id", !"i"}

// IR: !5 = !{!"llvm.loop.fission.enable", i1 true}

// IR: !6 = !{!"llvm.loop.fission.split_at", i64 1}

// IR: !7 = !{!"llvm.loop.fission.followup_fissioned", !8, !9}

// IR: !5 = !{!"llvm.loop.distribute.enable", i1 true}

// IR: !6 = !{!"llvm.loop.distribute.split_at", i64 1}

// IR: !7 = !{!"llvm.loop.distribute.followup_distributed", !8, !9}

// IR: !8 = distinct !{!8, !3}

// IR: !9 = distinct !{!9, !3}