[LLVMdev] [POLLY] fix Bug 15817

[Sebastian Pop]

Sebastian Pop wrote:
> Sebastian Pop wrote:
> > Jack Howarth wrote:
> > >    The attached patch eliminates http://llvm.org/bugs/show_bug.cgi?id=15817 by removing the remaining
> > > "; XFAIL:*" added in http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20130415/171812.html.
> > > The Isl/CodeGen/scevcodegen-1.ll testcase in polly appears as an XPASS in current llvm/polly 3.3
> > > and trunk svn for both x86_64-apple-darwin* and x86_64 Fedora 15 when built against isl 0.11.1/2 and
> > > cloog 0.18.0. The attached patch eliminates this unexpected XPASS seen with newer isl/cloog.
> > >              Jack
> > 
> > > Index: test/Isl/CodeGen/scevcodegen-1.ll
> > > ===================================================================
> > > --- test/Isl/CodeGen/scevcodegen-1.ll	(revision 182998)
> > > +++ test/Isl/CodeGen/scevcodegen-1.ll	(working copy)
> > > @@ -1,7 +1,6 @@
> > >  ; RUN: opt %loadPolly -polly-codegen-isl -polly-codegen-scev %s
> > >  ; -polly-independent causes: Cannot generate independent blocks
> > >  ;
> > > -; XFAIL:*
> > >  target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
> > >  target triple = "x86_64-unknown-linux-gnu"
> > >  
> > 
> > If I remove that XFAIL the testcase is ICEing on my ARM laptop with:
> > 
> > opt: ../tools/polly/lib/Analysis/ScopDetection.cpp:353: bool polly::ScopDetection::isValidInstruction(llvm::Instruction&, polly::ScopDetection::DetectionContext&) const: Assertion `!Context.Verifying && "IndVar"' failed.
> > 
> 
> This was with ISL as of this commit:
> 
> commit 02b2b6f2298d6beca919692219a287986e984347
> Author: Sven Verdoolaege <skimo at kotnet.org>
> Date:   Tue Apr 9 17:37:46 2013 +0200
> 
> 
> When updating ISL to master as of today, I get a compile error when building polly:
> 
> commit 1df91d8515ec88dc7f7f597168ad0f34f26de5a7
> Author: Sven Verdoolaege <skimo at kotnet.org>
> Date:   Wed Apr 17 12:38:51 2013 +0200
> 
>     isl_ast_codegen.c: contruct_shifted_executed: use isl_val
>     
>     Signed-off-by: Sven Verdoolaege <skimo at kotnet.org>
> 
> 
> In file included from ../tools/polly/lib/DeadCodeElimination.cpp:23:0:
> /home/spop/s/isl/usr/include/isl/union_map.h:114:23: error: ‘isl_multi_aff’ has not been declared
> 

After fixing this build problem, I still see the ICE on
armv7l-unknown-linux-gnueabihf

diff --git a/lib/DeadCodeElimination.cpp b/lib/DeadCodeElimination.cpp
index 2a780e6..04daeae 100644
--- a/lib/DeadCodeElimination.cpp
+++ b/lib/DeadCodeElimination.cpp
@@ -20,6 +20,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "polly/Dependences.h"
+#include "isl/aff_type.h"
 #include "isl/union_map.h"
 #include "polly/LinkAllPasses.h"
 #include "polly/ScopInfo.h"

Sebastian
-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation