[Polly] Exclude Ignored Intrinsics from explicit instruction list

[nandini12396]

This comment was removed by nandini12396.

[nandini12396]

This comment was removed by nandini12396.

[nandini12396]

Ok Sir. I got it finally! This is wrong. I will update this diff. Thank you.

[Meinersbur]

test/ScopInfo/intrinsics_misc.ll

1 ↗

(On Diff #101003)

Remove -S. It is ignored when you also specify -analyze.

The result of this command is:

Printing analysis 'Polly - Create polyhedral description of Scops' for region: 'for.cond1 => for.end' in function '_Z2jdv':
Invalid Scop!
Printing analysis 'Polly - Create polyhedral description of Scops' for region: 'for.cond => for.end12' in function '_Z2jdv':
Invalid Scop!
Printing analysis 'Polly - Create polyhedral description of Scops' for region: 'entry => <Function Return>' in function '_Z2jdv':
Invalid Scop!

that is, there is no valid scop detection in this function.

Test cases should fail without the change you are intending to make.

[nandini12396]

yes, sorry forgot to remove that.

[Meinersbur]

The test case still does not fail when I undo the change in ScopBuilder.cpp

Instead of CHECK-NOT, try a positive match (CHECK-NEXT) of all the instruction list that are supposed to be in there.

[Meinersbur]

You test case is relatively large for such a simple check. Can you find a smaller one? The one in D33163 was a lot smaller. Only a loop and a store in its body is required for the smallest scop. I prefer manually crafted IR over clang-generated IR. Avoid unnamed values (e.g. %0) which can cause a problems with finding unique names in LLVM. The pass -instnamer gives ever value a name.

[nandini12396]

Addressed Michael Sir's comments.

polly/trunk/lib/Analysis/ScopBuilder.cpp

void ScopBuilder::buildStmts(Region &SR) {
 
   for (auto I = SR.element_begin(), E = SR.element_end(); I != E; ++I)
     if (I->isSubRegion())
       buildStmts(*I->getNodeAs<Region>());
     else {
       std::vector<Instruction *> Instructions;
       for (Instruction &Inst : *I->getNodeAs<BasicBlock>()) {
         Loop *L = LI.getLoopFor(Inst.getParent());
-        if (!isa<TerminatorInst>(&Inst) && !canSynthesize(&Inst, *scop, &SE, L))
+        if (!isa<TerminatorInst>(&Inst) && !isIgnoredIntrinsic(&Inst) &&
+            !canSynthesize(&Inst, *scop, &SE, L))
           Instructions.push_back(&Inst);
       }
       Loop *SurroundingLoop = LI.getLoopFor(I->getNodeAs<BasicBlock>());
       scop->addScopStmt(I->getNodeAs<BasicBlock>(), SurroundingLoop,
                         Instructions);
     }
 }
 

polly/trunk/test/ScopInfo/intrinsics.ll

+; RUN: opt %loadPolly -polly-scops -analyze -polly-print-instructions < %s | FileCheck %s
+;
+; Verify that we remove the ignored intrinsics from the instruction list.
+;
+; CHECK:       Instructions {
+; CHECK-NEXT:      store i32 %i.0, i32* %arrayidx, align 4
+; CHECK-NEXT:    }
+;
+;    int A[1024];
+;    void func() {
+;      for (int i = 0; i < 1024; i++)
+;          A[i] = i;
+;    }
+;
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+
+define void @fun() #0 {
+entry:
+  %A = alloca [1024 x i32], align 16
+  br label %for.cond
+
+for.cond:                                         ; preds = %for.inc, %entry
+  %i.0 = phi i32 [ 0, %entry ], [ %inc, %for.inc ]
+  %cmp = icmp slt i32 %i.0, 1024
+  br i1 %cmp, label %for.body, label %for.end
+
+for.body:                                         ; preds = %for.cond
+  %idxprom = sext i32 %i.0 to i64
+  %arrayidx = getelementptr inbounds [1024 x i32], [1024 x i32]* %A, i64 0, i64 %idxprom
+  call void @llvm.donothing()
+  store i32 %i.0, i32* %arrayidx, align 4
+  br label %for.inc
+
+for.inc:                                          ; preds = %for.body
+  %inc = add nsw i32 %i.0, 1
+  br label %for.cond
+
+for.end:                                          ; preds = %for.cond
+  ret void
+}
+
+; Function Attrs: nounwind readnone
+declare void @llvm.donothing() #1
+
+attributes #0 = { noinline nounwind uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }