Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[LoopUnroll] Add check to Latch's terminator in UnrollRuntimeLoopRema…
…inder In this patch, I'm adding an extra check to the Latch's terminator in llvm::UnrollRuntimeLoopRemainder, similar to how it is already done in the llvm::UnrollLoop. The compiler would crash if this function is called with a malformed loop. Patch by Rodrigo Caetano Rocha! Differential Revision: https://reviews.llvm.org/D51486 llvm-svn: 342958
- Loading branch information
1 parent
029aa8e
commit 9108c2b
Showing
4 changed files
with
123 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
llvm/test/Transforms/LoopUnroll/runtime-loop-non-exiting-latch.ll
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
; REQUIRES: asserts | ||
; RUN: opt < %s -S -loop-unroll -unroll-runtime=true -unroll-allow-remainder=true -unroll-count=4 | ||
|
||
; Make sure that the runtime unroll does not break with a non-exiting latch. | ||
define i32 @test(i32* %a, i32* %b, i32* %c, i64 %n) { | ||
entry: | ||
br label %while.cond | ||
|
||
while.cond: ; preds = %while.body, %entry | ||
%i.0 = phi i64 [ 0, %entry ], [ %inc, %while.body ] | ||
%cmp = icmp slt i64 %i.0, %n | ||
br i1 %cmp, label %while.body, label %while.end | ||
|
||
while.body: ; preds = %while.cond | ||
%arrayidx = getelementptr inbounds i32, i32* %b, i64 %i.0 | ||
%0 = load i32, i32* %arrayidx | ||
%arrayidx1 = getelementptr inbounds i32, i32* %c, i64 %i.0 | ||
%1 = load i32, i32* %arrayidx1 | ||
%mul = mul nsw i32 %0, %1 | ||
%arrayidx2 = getelementptr inbounds i32, i32* %a, i64 %i.0 | ||
store i32 %mul, i32* %arrayidx2 | ||
%inc = add nsw i64 %i.0, 1 | ||
br label %while.cond | ||
|
||
while.end: ; preds = %while.cond | ||
ret i32 0 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
//===- UnrollLoopTest.cpp - Unit tests for UnrollLoop ---------------------===// | ||
// | ||
// The LLVM Compiler Infrastructure | ||
// | ||
// This file is distributed under the University of Illinois Open Source | ||
// License. See LICENSE.TXT for details. | ||
// | ||
//===----------------------------------------------------------------------===// | ||
|
||
#include "llvm/Transforms/Utils/UnrollLoop.h" | ||
#include "llvm/Analysis/AssumptionCache.h" | ||
#include "llvm/Analysis/LoopInfo.h" | ||
#include "llvm/Analysis/ScalarEvolution.h" | ||
#include "llvm/Analysis/TargetLibraryInfo.h" | ||
#include "llvm/AsmParser/Parser.h" | ||
#include "llvm/IR/BasicBlock.h" | ||
#include "llvm/IR/Dominators.h" | ||
#include "llvm/IR/LLVMContext.h" | ||
#include "llvm/Support/SourceMgr.h" | ||
#include "gtest/gtest.h" | ||
|
||
using namespace llvm; | ||
|
||
static std::unique_ptr<Module> parseIR(LLVMContext &C, const char *IR) { | ||
SMDiagnostic Err; | ||
std::unique_ptr<Module> Mod = parseAssemblyString(IR, Err, C); | ||
if (!Mod) | ||
Err.print("UnrollLoopTests", errs()); | ||
return Mod; | ||
} | ||
|
||
TEST(LoopUnrollRuntime, Latch) { | ||
LLVMContext C; | ||
|
||
std::unique_ptr<Module> M = parseIR( | ||
C, | ||
R"(define i32 @test(i32* %a, i32* %b, i32* %c, i64 %n) { | ||
entry: | ||
br label %while.cond | ||
while.cond: ; preds = %while.body, %entry | ||
%i.0 = phi i64 [ 0, %entry ], [ %inc, %while.body ] | ||
%cmp = icmp slt i64 %i.0, %n | ||
br i1 %cmp, label %while.body, label %while.end | ||
while.body: ; preds = %while.cond | ||
%arrayidx = getelementptr inbounds i32, i32* %b, i64 %i.0 | ||
%0 = load i32, i32* %arrayidx | ||
%arrayidx1 = getelementptr inbounds i32, i32* %c, i64 %i.0 | ||
%1 = load i32, i32* %arrayidx1 | ||
%mul = mul nsw i32 %0, %1 | ||
%arrayidx2 = getelementptr inbounds i32, i32* %a, i64 %i.0 | ||
store i32 %mul, i32* %arrayidx2 | ||
%inc = add nsw i64 %i.0, 1 | ||
br label %while.cond | ||
while.end: ; preds = %while.cond | ||
ret i32 0 | ||
})" | ||
); | ||
|
||
auto *F = M->getFunction("test"); | ||
DominatorTree DT(*F); | ||
LoopInfo LI(DT); | ||
AssumptionCache AC(*F); | ||
TargetLibraryInfoImpl TLII; | ||
TargetLibraryInfo TLI(TLII); | ||
ScalarEvolution SE(*F, TLI, AC, DT, LI); | ||
|
||
Loop *L = *LI.begin(); | ||
|
||
bool PreserveLCSSA = L->isRecursivelyLCSSAForm(DT,LI); | ||
|
||
bool ret = UnrollRuntimeLoopRemainder(L, 4, true, false, false, &LI, &SE, &DT, &AC, PreserveLCSSA); | ||
EXPECT_FALSE(ret); | ||
} |