Commit 34735af3 authored by Mark Heffernan's avatar Mark Heffernan
Browse files

Rename metadata llvm.loop.vectorize.unroll to llvm.loop.vectorize.interleave. 

llvm-svn: 213587
parent 24d8aacd

clang/lib/CodeGen/CGLoopInfo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static MDNode *createMetadata(LLVMContext &Ctx, const LoopAttributes &Attrs) { 


  // Setting vectorizer.unroll

  if (Attrs.VectorizerUnroll > 0) {

    Value *Vals[] = { MDString::get(Ctx, "llvm.loop.vectorize.unroll"),

    Value *Vals[] = { MDString::get(Ctx, "llvm.loop.interleave.count"),

                      ConstantInt::get(Type::getInt32Ty(Ctx),

                                       Attrs.VectorizerUnroll) };

    Args.push_back(MDNode::get(Ctx, Vals));

clang/lib/CodeGen/CGLoopInfo.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ struct LoopAttributes { 
  /// \brief llvm.loop.vectorize.width

  unsigned VectorizerWidth;



  /// \brief llvm.loop.vectorize.unroll

  /// \brief llvm.loop.interleave.count

  unsigned VectorizerUnroll;

};

clang/lib/CodeGen/CGStmt.cpp

+1 −1
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ void CodeGenFunction::EmitCondBrHints(llvm::LLVMContext &Context, 
      break;

    case LoopHintAttr::Interleave:

    case LoopHintAttr::InterleaveCount:

      MetadataName = "llvm.loop.vectorize.unroll";

      MetadataName = "llvm.loop.interleave.count";

      break;

    case LoopHintAttr::Unroll:

      MetadataName = "llvm.loop.unroll.enable";

clang/test/CodeGen/pragma-loop.cpp

+3 −3
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ void template_test(double *List, int Length) { 
// CHECK: ![[LOOP_1]] = metadata !{metadata ![[LOOP_1]], metadata ![[UNROLLENABLE_1:.*]], metadata ![[WIDTH_4:.*]], metadata ![[INTERLEAVE_4:.*]], metadata ![[INTENABLE_1:.*]]}

// CHECK: ![[UNROLLENABLE_1]] = metadata !{metadata !"llvm.loop.unroll.enable", i1 true}

// CHECK: ![[WIDTH_4]] = metadata !{metadata !"llvm.loop.vectorize.width", i32 4}

// CHECK: ![[INTERLEAVE_4]] = metadata !{metadata !"llvm.loop.vectorize.unroll", i32 4}

// CHECK: ![[INTERLEAVE_4]] = metadata !{metadata !"llvm.loop.interleave.count", i32 4}

// CHECK: ![[INTENABLE_1]] = metadata !{metadata !"llvm.loop.vectorize.enable", i1 true}

// CHECK: ![[LOOP_2]] = metadata !{metadata ![[LOOP_2:.*]], metadata ![[UNROLLENABLE_0:.*]], metadata ![[INTERLEAVE_4:.*]], metadata ![[WIDTH_8:.*]]}

// CHECK: ![[UNROLLENABLE_0]] = metadata !{metadata !"llvm.loop.unroll.enable", i1 false}
@@ -119,11 +119,11 @@ void template_test(double *List, int Length) { 
// CHECK: ![[LOOP_3]] = metadata !{metadata ![[LOOP_3]], metadata ![[UNROLL_8:.*]], metadata ![[INTERLEAVE_4:.*]], metadata ![[ENABLE_1:.*]]}

// CHECK: ![[UNROLL_8]] = metadata !{metadata !"llvm.loop.unroll.count", i32 8}

// CHECK: ![[LOOP_4]] = metadata !{metadata ![[LOOP_4]], metadata ![[INTERLEAVE_2:.*]], metadata ![[WIDTH_2:.*]]}

// CHECK: ![[INTERLEAVE_2]] = metadata !{metadata !"llvm.loop.vectorize.unroll", i32 2}

// CHECK: ![[INTERLEAVE_2]] = metadata !{metadata !"llvm.loop.interleave.count", i32 2}

// CHECK: ![[WIDTH_2]] = metadata !{metadata !"llvm.loop.vectorize.width", i32 2}

// CHECK: ![[LOOP_5]] = metadata !{metadata ![[LOOP_5]], metadata ![[UNROLLENABLE_0:.*]], metadata ![[WIDTH_1:.*]]}

// CHECK: ![[WIDTH_1]] = metadata !{metadata !"llvm.loop.vectorize.width", i32 1}

// CHECK: ![[LOOP_6]] = metadata !{metadata ![[LOOP_6]], metadata ![[UNROLL_8:.*]], metadata ![[INTERLEAVE_2:.*]], metadata ![[WIDTH_2:.*]]}

// CHECK: ![[LOOP_7]] = metadata !{metadata ![[LOOP_7]], metadata ![[UNROLL_8:.*]], metadata ![[INTERLEAVE_8:.*]], metadata ![[WIDTH_8:.*]]}

// CHECK: ![[INTERLEAVE_8]] = metadata !{metadata !"llvm.loop.vectorize.unroll", i32 8}

// CHECK: ![[INTERLEAVE_8]] = metadata !{metadata !"llvm.loop.interleave.count", i32 8}

// CHECK: ![[LOOP_8]] = metadata !{metadata ![[LOOP_8]], metadata ![[UNROLL_8:.*]], metadata ![[INTERLEAVE_2:.*]], metadata ![[WIDTH_2:.*]]}