Index: lib/Analysis/ScopBuilder.cpp
===================================================================
--- lib/Analysis/ScopBuilder.cpp
+++ lib/Analysis/ScopBuilder.cpp
@@ -102,17 +102,18 @@
     cl::desc("Disable multiplicative reductions"), cl::Hidden, cl::ZeroOrMore,
     cl::init(false), cl::cat(PollyCategory));
 
-enum class GranularityChoice { BasicBlocks, Stores };
-
-static cl::opt<GranularityChoice>
-    StmtGranularity("polly-stmt-granularity",
-                    cl::desc("Select the statement granularity algorithm"),
-                    cl::values(clEnumValN(GranularityChoice::BasicBlocks, "bb",
-                                          "Entire basic blocks granularity"),
-                               clEnumValN(GranularityChoice::Stores, "store",
-                                          "Store-level granularity")),
-                    cl::init(GranularityChoice::BasicBlocks),
-                    cl::cat(PollyCategory));
+enum class GranularityChoice { BasicBlocks, Stores, Instructions };
+
+static cl::opt<GranularityChoice> StmtGranularity(
+    "polly-stmt-granularity",
+    cl::desc("Select the statement granularity algorithm"),
+    cl::values(clEnumValN(GranularityChoice::BasicBlocks, "bb",
+                          "Entire basic blocks granularity"),
+               clEnumValN(GranularityChoice::Stores, "store",
+                          "Store-level granularity"),
+               clEnumValN(GranularityChoice::Instructions, "instruction",
+                          "Instruction-level granularity")),
+    cl::init(GranularityChoice::BasicBlocks), cl::cat(PollyCategory));
 
 void ScopBuilder::buildPHIAccesses(ScopStmt *PHIStmt, PHINode *PHI,
                                    Region *NonAffineSubRegion,
@@ -699,6 +700,7 @@
         if (shouldModelInst(&Inst, L))
           Instructions.push_back(&Inst);
         if (Inst.getMetadata("polly_split_after") ||
+            StmtGranularity == GranularityChoice::Instructions ||
             (StmtGranularity == GranularityChoice::Stores &&
              isa<StoreInst>(Inst))) {
           Loop *SurroundingLoop = LI.getLoopFor(I->getNodeAs<BasicBlock>());
@@ -737,6 +739,7 @@
       Count++;
     }
     if (Inst.getMetadata("polly_split_after") ||
+        StmtGranularity == GranularityChoice::Instructions ||
         (StmtGranularity == GranularityChoice::Stores && isa<StoreInst>(Inst)))
       Split = true;
 
Index: test/ScopInfo/stmt_split_on_each_inst.ll
===================================================================
--- /dev/null
+++ test/ScopInfo/stmt_split_on_each_inst.ll
@@ -0,0 +1,62 @@
+; RUN: opt %loadPolly -polly-scops -analyze -polly-stmt-granularity=instruction -polly-print-instructions < %s | FileCheck %s
+
+;      void func(int *A, int *B){
+;        for (int i = 0; i < 1024; i+=1) {
+;      Stmt:
+;          A[i] = i;
+;          B[i] = i;
+;        }
+;      }
+;
+; CHECK:    Statements {
+; CHECK-NEXT: 	Stmt_Stmt2
+; CHECK-NEXT:       Domain :=
+; CHECK-NEXT:           { Stmt_Stmt2[i0] : 0 <= i0 <= 1023 };
+; CHECK-NEXT:       Schedule :=
+; CHECK-NEXT:           { Stmt_Stmt2[i0] -> [i0, 0] };
+; CHECK-NEXT:       MustWriteAccess :=	[Reduction Type: NONE] [Scalar: 0]
+; CHECK-NEXT:           { Stmt_Stmt2[i0] -> MemRef_A[i0] };
+; CHECK-NEXT:       Instructions {
+; CHECK-NEXT:             store i32 %i.0, i32* %arrayidx, align 4
+; CHECK-NEXT:       }
+; CHECK-NEXT:  	Stmt_Stmt5
+; CHECK-NEXT:       Domain :=
+; CHECK-NEXT:           { Stmt_Stmt5[i0] : 0 <= i0 <= 1023 };
+; CHECK-NEXT:       Schedule :=
+; CHECK-NEXT:           { Stmt_Stmt5[i0] -> [i0, 1] };
+; CHECK-NEXT:       MustWriteAccess :=	[Reduction Type: NONE] [Scalar: 0]
+; CHECK-NEXT:           { Stmt_Stmt5[i0] -> MemRef_B[i0] };
+; CHECK-NEXT:       Instructions {
+; CHECK-NEXT:             store i32 %i.0, i32* %arrayidx2, align 4
+; CHECK-NEXT:       }
+; CHECK-NEXT:    }
+;
+; Function Attrs: noinline nounwind uwtable
+define void @func(i32* %A, i32* %B) #0 {
+entry:
+  br label %for.cond
+
+for.cond:                                         ; preds = %for.inc, %entry
+  %i.0 = phi i32 [ 0, %entry ], [ %add, %for.inc ]
+  %cmp = icmp slt i32 %i.0, 1024
+  br i1 %cmp, label %for.body, label %for.end
+
+for.body:                                         ; preds = %for.cond
+  br label %Stmt
+
+Stmt:                                             ; preds = %for.body
+  %idxprom = sext i32 %i.0 to i64
+  %arrayidx = getelementptr inbounds i32, i32* %A, i64 %idxprom
+  store i32 %i.0, i32* %arrayidx, align 4
+  %idxprom1 = sext i32 %i.0 to i64
+  %arrayidx2 = getelementptr inbounds i32, i32* %B, i64 %idxprom1
+  store i32 %i.0, i32* %arrayidx2, align 4
+  br label %for.inc
+
+for.inc:                                          ; preds = %Stmt
+  %add = add nsw i32 %i.0, 1
+  br label %for.cond
+
+for.end:                                          ; preds = %for.cond
+  ret void
+}