Index: include/polly/CodeGen/IRBuilder.h =================================================================== --- include/polly/CodeGen/IRBuilder.h +++ include/polly/CodeGen/IRBuilder.h @@ -17,6 +17,7 @@ #include "llvm/ADT/MapVector.h" #include "llvm/Analysis/LoopInfo.h" +#include "llvm/Analysis/ScalarEvolution.h" #include "llvm/IR/IRBuilder.h" #include "llvm/IR/ValueMap.h" @@ -115,11 +116,10 @@ OtherAliasScopeListMap; /// A map from pointers to second level alias scopes. - llvm::DenseMap, llvm::MDNode *> - SecondLevelAliasScopeMap; + llvm::DenseMap SecondLevelAliasScopeMap; /// A map from pointers to second level alias scope list of other pointers. - llvm::DenseMap, llvm::MDNode *> + llvm::DenseMap SecondLevelOtherAliasScopeListMap; /// Inter iteration alias-free base pointers. Index: lib/CodeGen/IRBuilder.cpp =================================================================== --- lib/CodeGen/IRBuilder.cpp +++ lib/CodeGen/IRBuilder.cpp @@ -140,12 +140,14 @@ void ScopAnnotator::annotateSecondLevel(llvm::Instruction *Inst, llvm::Value *BasePtr) { - auto *Ptr = getMemAccInstPointerOperand(Inst); - if (!Ptr) + auto *PtrSCEV = SE->getSCEV(getMemAccInstPointerOperand(Inst)); + auto *BasePtrSCEV = SE->getPointerBase(PtrSCEV); + + if (!PtrSCEV) return; - auto SecondLevelAliasScope = SecondLevelAliasScopeMap.lookup(Ptr); + auto SecondLevelAliasScope = SecondLevelAliasScopeMap.lookup(PtrSCEV); auto SecondLevelOtherAliasScopeList = - SecondLevelOtherAliasScopeListMap.lookup(Ptr); + SecondLevelOtherAliasScopeListMap.lookup(PtrSCEV); if (!SecondLevelAliasScope) { auto AliasScope = AliasScopeMap.lookup(BasePtr); if (!AliasScope) @@ -153,16 +155,16 @@ LLVMContext &Ctx = SE->getContext(); SecondLevelAliasScope = getID( Ctx, AliasScope, MDString::get(Ctx, "second level alias metadata")); - SecondLevelAliasScopeMap[Ptr] = SecondLevelAliasScope; + SecondLevelAliasScopeMap[PtrSCEV] = SecondLevelAliasScope; Metadata *Args = {SecondLevelAliasScope}; auto SecondLevelBasePtrAliasScopeList = - SecondLevelAliasScopeMap.lookup(BasePtr); - SecondLevelAliasScopeMap[BasePtr] = MDNode::concatenate( + SecondLevelAliasScopeMap.lookup(BasePtrSCEV); + SecondLevelAliasScopeMap[BasePtrSCEV] = MDNode::concatenate( SecondLevelBasePtrAliasScopeList, MDNode::get(Ctx, Args)); auto OtherAliasScopeList = OtherAliasScopeListMap.lookup(BasePtr); SecondLevelOtherAliasScopeList = MDNode::concatenate( OtherAliasScopeList, SecondLevelBasePtrAliasScopeList); - SecondLevelOtherAliasScopeListMap[Ptr] = SecondLevelOtherAliasScopeList; + SecondLevelOtherAliasScopeListMap[PtrSCEV] = SecondLevelOtherAliasScopeList; } Inst->setMetadata("alias.scope", SecondLevelAliasScope); Inst->setMetadata("noalias", SecondLevelOtherAliasScopeList); Index: test/ScheduleOptimizer/kernel_gemm___%for.body---%for.end24.jscop.transformed =================================================================== --- /dev/null +++ test/ScheduleOptimizer/kernel_gemm___%for.body---%for.end24.jscop.transformed @@ -0,0 +1,55 @@ +{ + "arrays" : [ + { + "name" : "MemRef_C1", + "sizes" : [ "*" ], + "type" : "double" + }, + { + "name" : "MemRef_A", + "sizes" : [ "*", "1024" ], + "type" : "double" + }, + { + "name" : "MemRef_B", + "sizes" : [ "*", "1024" ], + "type" : "double" + }, + { + "name" : "MemRef_C", + "sizes" : [ "*", "1024" ], + "type" : "double" + } + ], + "context" : "{ : }", + "name" : "%for.body---%for.end24", + "statements" : [ + { + "accesses" : [ + { + "kind" : "read", + "relation" : "{ Stmt_for_body6[i0, i1, i2] -> MemRef_C[i0, i1] }" + }, + { + "kind" : "read", + "relation" : "{ Stmt_for_body6[i0, i1, i2] -> MemRef_A[i0, i2] }" + }, + { + "kind" : "read", + "relation" : "{ Stmt_for_body6[i0, i1, i2] -> MemRef_B[i2, i1] }" + }, + { + "kind" : "read", + "relation" : "{ Stmt_for_body6[i0, i1, i2] -> MemRef_C1[0] }" + }, + { + "kind" : "write", + "relation" : "{ Stmt_for_body6[i0, i1, i2] -> MemRef_C[i0, i1] }" + } + ], + "domain" : "{ Stmt_for_body6[i0, i1, i2] : 0 <= i0 <= 1023 and 0 <= i1 <= 1023 and 0 <= i2 <= 1023 }", + "name" : "Stmt_for_body6", + "schedule" : "{ Stmt_for_body6[i0, i1, i2] -> [i0, i1, i2] }" + } + ] +} Index: test/ScheduleOptimizer/pattern-matching-based-opts_12.ll =================================================================== --- /dev/null +++ test/ScheduleOptimizer/pattern-matching-based-opts_12.ll @@ -0,0 +1,107 @@ +; RUN: opt %loadPolly -polly-import-jscop -polly-opt-isl \ +; RUN: -polly-target-throughput-vector-fma=1 \ +; RUN: -polly-target-latency-vector-fma=8 \ +; RUN: -polly-target-1st-cache-level-associativity=8 \ +; RUN: -polly-target-2nd-cache-level-associativity=8 \ +; RUN: -polly-target-1st-cache-level-size=32768 \ +; RUN: -polly-target-vector-register-bitwidth=256 \ +; RUN: -polly-target-2nd-cache-level-size=262144 \ +; RUN: -polly-import-jscop-postfix=transformed -polly-codegen -S < %s \ +; RUN: | FileCheck %s +; +; Check that we do not create different alias sets for locations represented by +; different raw pointers. +; +; CHECK: !0 = distinct !{!0, !1, !"polly.alias.scope.MemRef_B"} +; CHECK-NEXT: !1 = distinct !{!1, !"polly.alias.scope.domain"} +; CHECK-NEXT: !2 = !{!3, !4, !5, !6, !7} +; CHECK-NEXT: !3 = distinct !{!3, !1, !"polly.alias.scope.MemRef_C1"} +; CHECK-NEXT: !4 = distinct !{!4, !1, !"polly.alias.scope.MemRef_A"} +; CHECK-NEXT: !5 = distinct !{!5, !1, !"polly.alias.scope.MemRef_C"} +; CHECK-NEXT: !6 = distinct !{!6, !1, !"polly.alias.scope.Packed_B"} +; CHECK-NEXT: !7 = distinct !{!7, !1, !"polly.alias.scope.Packed_A"} +; CHECK-NEXT: !8 = !{!3, !4, !0, !5, !7} +; CHECK-NEXT: !9 = !{!3, !0, !5, !6, !7} +; CHECK-NEXT: !10 = !{!3, !4, !0, !5, !6} +; CHECK-NEXT: !11 = distinct !{!11, !5, !"second level alias metadata"} +; CHECK-NEXT: !12 = !{!3, !4, !0, !6, !7} +; CHECK-NEXT: !13 = !{!4, !0, !5, !6, !7} +; CHECK-NEXT: !14 = distinct !{!14, !5, !"second level alias metadata"} +; CHECK-NEXT: !15 = !{!3, !4, !0, !6, !7, !11} +; CHECK-NEXT: !16 = distinct !{!16, !5, !"second level alias metadata"} +; CHECK-NEXT: !17 = !{!3, !4, !0, !6, !7, !11, !14} +; CHECK-NEXT: !18 = distinct !{!18, !5, !"second level alias metadata"} +; CHECK-NEXT: !19 = !{!3, !4, !0, !6, !7, !11, !14, !16} +; CHECK-NEXT: !20 = distinct !{!20, !5, !"second level alias metadata"} +; CHECK-NEXT: !21 = !{!3, !4, !0, !6, !7, !11, !14, !16, !18} +; CHECK-NEXT: !22 = distinct !{!22, !5, !"second level alias metadata"} +; CHECK-NEXT: !23 = !{!3, !4, !0, !6, !7, !11, !14, !16, !18, !20} +; CHECK-NEXT: !24 = distinct !{!24, !5, !"second level alias metadata"} +; CHECK-NEXT: !25 = !{!3, !4, !0, !6, !7, !11, !14, !16, !18, !20, !22} +; CHECK-NEXT: !26 = distinct !{!26, !5, !"second level alias metadata"} +; CHECK-NEXT: !27 = !{!3, !4, !0, !6, !7, !11, !14, !16, !18, !20, !22, !24} +; CHECK-NEXT: !28 = distinct !{!28, !5, !"second level alias metadata"} +; CHECK-NEXT: !29 = !{!3, !4, !0, !6, !7, !11, !14, !16, !18, !20, !22, !24, !26} +; CHECK-NEXT: !30 = distinct !{!30, !5, !"second level alias metadata"} +; CHECK-NEXT: !31 = !{!3, !4, !0, !6, !7, !11, !14, !16, !18, !20, !22, !24, !26, !28} +; CHECK-NEXT: !32 = distinct !{!32, !5, !"second level alias metadata"} +; CHECK-NEXT: !33 = !{!3, !4, !0, !6, !7, !11, !14, !16, !18, !20, !22, !24, !26, !28, !30} +; CHECK-NEXT: !34 = distinct !{!34, !5, !"second level alias metadata"} +; CHECK-NEXT: !35 = !{!3, !4, !0, !6, !7, !11, !14, !16, !18, !20, !22, !24, !26, !28, !30, !32} +; CHECK-NEXT: !36 = distinct !{!36, !5, !"second level alias metadata"} +; CHECK-NEXT: !37 = !{!3, !4, !0, !6, !7, !11, !14, !16, !18, !20, !22, !24, !26, !28, !30, !32, !34} +; CHECK-NEXT: !38 = distinct !{!38, !5, !"second level alias metadata"} +; CHECK-NEXT: !39 = !{!3, !4, !0, !6, !7, !11, !14, !16, !18, !20, !22, !24, !26, !28, !30, !32, !34, !36} +; CHECK-NEXT: !40 = distinct !{!40, !5, !"second level alias metadata"} +; CHECK-NEXT: !41 = !{!3, !4, !0, !6, !7, !11, !14, !16, !18, !20, !22, !24, !26, !28, !30, !32, !34, !36, !38} +; CHECK-NEXT: !42 = distinct !{!42, !5, !"second level alias metadata"} +; CHECK-NEXT: !43 = !{!3, !4, !0, !6, !7, !11, !14, !16, !18, !20, !22, !24, !26, !28, !30, !32, !34, !36, !38, !40} +; +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-unknown-unknown" + +define void @kernel_gemm(i32 %ni, i32 %nj, i32 %nk, [1024 x double]* %A, [1024 x double]* %B, [1024 x double]* %C, double* %C1) { +entry: + br label %entry.split + +entry.split: ; preds = %entry + br label %for.body + +for.body: ; preds = %for.inc22, %entry.split + %indvars.iv43 = phi i64 [ 0, %entry.split ], [ %indvars.iv.next44, %for.inc22 ] + br label %for.body3 + +for.body3: ; preds = %for.inc19, %for.body + %indvars.iv40 = phi i64 [ 0, %for.body ], [ %indvars.iv.next41, %for.inc19 ] + br label %for.body6 + +for.body6: ; preds = %for.body6, %for.body3 + %indvars.iv = phi i64 [ 0, %for.body3 ], [ %indvars.iv.next, %for.body6 ] + %tmp = load double, double* %C1, align 8 + %arrayidx9 = getelementptr inbounds [1024 x double], [1024 x double]* %A, i64 %indvars.iv43, i64 %indvars.iv + %tmp1 = load double, double* %arrayidx9, align 8 + %arrayidx13 = getelementptr inbounds [1024 x double], [1024 x double]* %B, i64 %indvars.iv, i64 %indvars.iv40 + %tmp2 = load double, double* %arrayidx13, align 8 + %mul = fmul double %tmp1, %tmp2 + %add = fadd double %tmp, %mul + %arrayidx17 = getelementptr inbounds [1024 x double], [1024 x double]* %C, i64 %indvars.iv43, i64 %indvars.iv40 + %tmp3 = load double, double* %arrayidx17, align 8 + %add18 = fadd double %tmp3, %add + store double %add18, double* %arrayidx17, align 8 + %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1 + %exitcond = icmp ne i64 %indvars.iv.next, 1024 + br i1 %exitcond, label %for.body6, label %for.inc19 + +for.inc19: ; preds = %for.body6 + %indvars.iv.next41 = add nuw nsw i64 %indvars.iv40, 1 + %exitcond42 = icmp ne i64 %indvars.iv.next41, 1024 + br i1 %exitcond42, label %for.body3, label %for.inc22 + +for.inc22: ; preds = %for.inc19 + %indvars.iv.next44 = add nuw nsw i64 %indvars.iv43, 1 + %exitcond45 = icmp ne i64 %indvars.iv.next44, 1024 + br i1 %exitcond45, label %for.body, label %for.end24 + +for.end24: ; preds = %for.inc22 + ret void +}