From ede4ecaefb087126a68a5380ec60e107fe8cc022 Mon Sep 17 00:00:00 2001 From: Johannes Doerfert Date: Tue, 10 May 2016 14:01:21 +0000 Subject: [PATCH] [FIX] Cleanup isl objects prior to early exit llvm-svn: 269061 --- polly/lib/Analysis/ScopInfo.cpp | 13 ++-- .../complex_domain_binary_condition.ll | 59 +++++++++++++++++++ 2 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 polly/test/ScopInfo/complex_domain_binary_condition.ll diff --git a/polly/lib/Analysis/ScopInfo.cpp b/polly/lib/Analysis/ScopInfo.cpp index 96c4ed90d602..38d402f10b43 100644 --- a/polly/lib/Analysis/ScopInfo.cpp +++ b/polly/lib/Analysis/ScopInfo.cpp @@ -1301,12 +1301,15 @@ buildConditionSets(ScopStmt &Stmt, Value *Condition, TerminatorInst *TI, auto Opcode = BinOp->getOpcode(); assert(Opcode == Instruction::And || Opcode == Instruction::Or); - if (!buildConditionSets(Stmt, BinOp->getOperand(0), TI, L, Domain, - ConditionSets)) - return false; - if (!buildConditionSets(Stmt, BinOp->getOperand(1), TI, L, Domain, - ConditionSets)) + bool Valid = buildConditionSets(Stmt, BinOp->getOperand(0), TI, L, Domain, + ConditionSets) && + buildConditionSets(Stmt, BinOp->getOperand(1), TI, L, Domain, + ConditionSets); + if (!Valid) { + while (!ConditionSets.empty()) + isl_set_free(ConditionSets.pop_back_val()); return false; + } isl_set_free(ConditionSets.pop_back_val()); isl_set *ConsCondPart0 = ConditionSets.pop_back_val(); diff --git a/polly/test/ScopInfo/complex_domain_binary_condition.ll b/polly/test/ScopInfo/complex_domain_binary_condition.ll new file mode 100644 index 000000000000..231986388eea --- /dev/null +++ b/polly/test/ScopInfo/complex_domain_binary_condition.ll @@ -0,0 +1,59 @@ +; RUN: opt %loadPolly -pass-remarks-analysis="polly-scops" -polly-scops \ +; RUN: < %s 2>&1 | FileCheck %s +; +; CHECK: Low complexity assumption: { : 1 = 0 } +; +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" + +%struct.bc_struct.0.2.4.6.13.20.27.43.44.46.50.52.58.60.81.89.90.99.107.108.109.111.116.118.149 = type { i32, i32, i32, i32, [1024 x i8] } + +; Function Attrs: nounwind uwtable +define void @bc_multiply(%struct.bc_struct.0.2.4.6.13.20.27.43.44.46.50.52.58.60.81.89.90.99.107.108.109.111.116.118.149* readonly %n1, i32 %scale) #0 { +entry: + %0 = load i32, i32* undef, align 4 + %1 = load i32, i32* undef, align 4 + %2 = load i32, i32* undef, align 4 + %add3 = add nsw i32 %2, %1 + %cmp = icmp sgt i32 %0, %2 + %. = select i1 %cmp, i32 %0, i32 %2 + %cmp12 = icmp slt i32 %., %scale + %scale.. = select i1 %cmp12, i32 %scale, i32 %. + %cmp26 = icmp sgt i32 0, %scale.. + %scale...add7 = select i1 %cmp26, i32 %scale.., i32 0 + %sub = sub nsw i32 0, %scale...add7 + %add.ptr = getelementptr inbounds %struct.bc_struct.0.2.4.6.13.20.27.43.44.46.50.52.58.60.81.89.90.99.107.108.109.111.116.118.149, %struct.bc_struct.0.2.4.6.13.20.27.43.44.46.50.52.58.60.81.89.90.99.107.108.109.111.116.118.149* %n1, i64 0, i32 4, i64 0 + %add.ptr59 = getelementptr inbounds i8, i8* %add.ptr, i64 -1 + %idx.ext62 = sext i32 %add3 to i64 + %cmp70140 = icmp sgt i32 %sub, 0 + br label %for.body104.lr.ph + +for.body104.lr.ph: ; preds = %entry + %3 = add i32 0, -1 + %4 = sub i32 %3, %scale...add7 + %5 = add i32 %4, 1 + %6 = sext i32 %5 to i64 + br label %for.body104 + +for.body104: ; preds = %while.end146, %for.body104.lr.ph + %indvars.iv = phi i64 [ %6, %for.body104.lr.ph ], [ undef, %while.end146 ] + %7 = sub nsw i64 %indvars.iv, %idx.ext62 + %cmp107 = icmp slt i64 %7, -1 + %.op = xor i64 %7, -1 + %idx.neg116 = select i1 %cmp107, i64 0, i64 %.op + %add.ptr117 = getelementptr inbounds i8, i8* %add.ptr59, i64 %idx.neg116 + br label %while.body138 + +while.body138: ; preds = %while.body138, %for.body104 + %n1ptr.1126 = phi i8* [ %incdec.ptr139, %while.body138 ], [ %add.ptr117, %for.body104 ] + %incdec.ptr139 = getelementptr inbounds i8, i8* %n1ptr.1126, i64 -1 + %cmp132 = icmp uge i8* %incdec.ptr139, null + %cmp135 = icmp slt i64 0, -1 + %or.cond99 = and i1 %cmp135, %cmp132 + br i1 %or.cond99, label %while.body138, label %while.end146 + +while.end146: ; preds = %while.body138 + br i1 undef, label %free_num.exit, label %for.body104 + +free_num.exit: ; preds = %while.end146 + ret void +}