Update the jscop tests and port them to isl codegen.

  The updated tests use a different context than the old ones did.
  Other than that only their path and the code generation we use
  changed.

llvm-svn: 214657

diff --git a/polly/test/Cloog/CodeGen/MemAccess/codegen_constant_offset.ll b/polly/test/Isl/CodeGen/MemAccess/codegen_constant_offset.ll
similarity index 93%
rename from polly/test/Cloog/CodeGen/MemAccess/codegen_constant_offset.ll
rename to polly/test/Isl/CodeGen/MemAccess/codegen_constant_offset.ll
index f19aed3..05874f3 100644 (file)
--- a/polly/test/Cloog/CodeGen/MemAccess/codegen_constant_offset.ll
+++ b/polly/test/Isl/CodeGen/MemAccess/codegen_constant_offset.ll
@@ -1,4 +1,4 @@
-;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-dir=%S -polly-import-jscop-postfix=transformed -polly-codegen -instnamer < %s -S | FileCheck %s
+;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-dir=%S -polly-import-jscop-postfix=transformed -polly-codegen-isl -instnamer < %s -S | FileCheck %s
 
 ;int A[100];
 ;

diff --git a/polly/test/Cloog/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop b/polly/test/Isl/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop
similarity index 96%
rename from polly/test/Cloog/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop
rename to polly/test/Isl/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop
index bf39e59..034183d 100644 (file)
--- a/polly/test/Cloog/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop
+++ b/polly/test/Isl/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop
@@ -1,5 +1,5 @@
 {
-   "context" : "{ [] }",
+   "context" : "{  :  }",
    "name" : "for.cond => for.end",
    "statements" : [
       {

diff --git a/polly/test/Cloog/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop.transformed b/polly/test/Isl/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop.transformed
similarity index 96%
rename from polly/test/Cloog/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop.transformed
rename to polly/test/Isl/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop.transformed
index e41a9d6..424137c 100644 (file)
--- a/polly/test/Cloog/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop.transformed
+++ b/polly/test/Isl/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop.transformed
@@ -1,5 +1,5 @@
 {
-   "context" : "{ [] }",
+   "context" : "{  :  }",
    "name" : "for.cond => for.end",
    "statements" : [
       {

diff --git a/polly/test/Cloog/CodeGen/MemAccess/codegen_simple.ll b/polly/test/Isl/CodeGen/MemAccess/codegen_simple.ll
similarity index 93%
rename from polly/test/Cloog/CodeGen/MemAccess/codegen_simple.ll
rename to polly/test/Isl/CodeGen/MemAccess/codegen_simple.ll
index 3119ed4..8fd660a 100644 (file)
--- a/polly/test/Cloog/CodeGen/MemAccess/codegen_simple.ll
+++ b/polly/test/Isl/CodeGen/MemAccess/codegen_simple.ll
@@ -1,4 +1,4 @@
-;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-dir=%S -polly-import-jscop-postfix=transformed -polly-codegen -instnamer < %s -S | FileCheck %s
+;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-dir=%S -polly-import-jscop-postfix=transformed -polly-codegen-isl -instnamer < %s -S | FileCheck %s
 
 ;int A[100];
 ;

diff --git a/polly/test/Cloog/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop b/polly/test/Isl/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop
similarity index 96%
rename from polly/test/Cloog/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop
rename to polly/test/Isl/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop
index bf39e59..034183d 100644 (file)
--- a/polly/test/Cloog/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop
+++ b/polly/test/Isl/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop
@@ -1,5 +1,5 @@
 {
-   "context" : "{ [] }",
+   "context" : "{  :  }",
    "name" : "for.cond => for.end",
    "statements" : [
       {

diff --git a/polly/test/Cloog/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop.transformed b/polly/test/Isl/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop.transformed
similarity index 96%
rename from polly/test/Cloog/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop.transformed
rename to polly/test/Isl/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop.transformed
index a2bed30..320c3cb 100644 (file)
--- a/polly/test/Cloog/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop.transformed
+++ b/polly/test/Isl/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop.transformed
@@ -1,5 +1,5 @@
 {
-   "context" : "{ [] }",
+   "context" : "{  :  }",
    "name" : "for.cond => for.end",
    "statements" : [
       {

diff --git a/polly/test/Cloog/CodeGen/MemAccess/codegen_simple_md.ll b/polly/test/Isl/CodeGen/MemAccess/codegen_simple_md.ll
similarity index 96%
rename from polly/test/Cloog/CodeGen/MemAccess/codegen_simple_md.ll
rename to polly/test/Isl/CodeGen/MemAccess/codegen_simple_md.ll
index 132f70f..8b22018 100644 (file)
--- a/polly/test/Cloog/CodeGen/MemAccess/codegen_simple_md.ll
+++ b/polly/test/Isl/CodeGen/MemAccess/codegen_simple_md.ll
@@ -1,5 +1,5 @@
-;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-dir=%S -polly-import-jscop-postfix=transformed+withconst -polly-codegen < %s -S | FileCheck -check-prefix=WITHCONST %s
-;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-dir=%S -polly-import-jscop-postfix=transformed+withoutconst -polly-codegen < %s -S | FileCheck -check-prefix=WITHOUTCONST %s
+;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-dir=%S -polly-import-jscop-postfix=transformed+withconst -polly-codegen-isl < %s -S | FileCheck -check-prefix=WITHCONST %s
+;RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-dir=%S -polly-import-jscop-postfix=transformed+withoutconst -polly-codegen-isl < %s -S | FileCheck -check-prefix=WITHOUTCONST %s
 
 ;int A[1040];
 ;

diff --git a/polly/test/Cloog/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop b/polly/test/Isl/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop
similarity index 100%
rename from polly/test/Cloog/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop
rename to polly/test/Isl/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop

diff --git a/polly/test/Cloog/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop.transformed+withconst b/polly/test/Isl/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop.transformed+withconst
similarity index 100%
rename from polly/test/Cloog/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop.transformed+withconst
rename to polly/test/Isl/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop.transformed+withconst

diff --git a/polly/test/Cloog/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop.transformed+withoutconst b/polly/test/Isl/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop.transformed+withoutconst
similarity index 100%
rename from polly/test/Cloog/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop.transformed+withoutconst
rename to polly/test/Isl/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop.transformed+withoutconst

diff --git a/polly/test/Cloog/CodeGen/MemAccess/simple.ll b/polly/test/Isl/CodeGen/MemAccess/simple.ll
similarity index 100%
rename from polly/test/Cloog/CodeGen/MemAccess/simple.ll
rename to polly/test/Isl/CodeGen/MemAccess/simple.ll

diff --git a/polly/test/Cloog/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop b/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop
similarity index 94%
rename from polly/test/Cloog/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop
rename to polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop
index ccee1cb..4742285 100644 (file)
--- a/polly/test/Cloog/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop
+++ b/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop
@@ -1,5 +1,5 @@
 {
-   "context" : "{ [] }",
+   "context" : "{  :  }",
    "name" : "for.cond => for.end",
    "statements" : [
       {

diff --git a/polly/test/Cloog/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop.transformed b/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop.transformed
similarity index 94%
rename from polly/test/Cloog/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop.transformed
rename to polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop.transformed
index a9853bd..0a33fe8 100644 (file)
--- a/polly/test/Cloog/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop.transformed
+++ b/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop.transformed
@@ -1,5 +1,5 @@
 {
-   "context" : "{ [] }",
+   "context" : "{  :  }",
    "name" : "for.cond => for.end",
    "statements" : [
       {

diff --git a/polly/test/Cloog/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop b/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop
similarity index 94%
rename from polly/test/Cloog/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop
rename to polly/test/Isl/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop
index 0794c01..56289bf 100644 (file)
--- a/polly/test/Cloog/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop
+++ b/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop
@@ -1,5 +1,5 @@
 {
-   "context" : "{ [] }",
+   "context" : "{  :  }",
    "name" : "for.cond4 => for.end14",
    "statements" : [
       {

diff --git a/polly/test/Cloog/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop.transformed b/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop.transformed
similarity index 94%
rename from polly/test/Cloog/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop.transformed
rename to polly/test/Isl/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop.transformed
index 5df6c36..6152943 100644 (file)
--- a/polly/test/Cloog/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop.transformed
+++ b/polly/test/Isl/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop.transformed
@@ -1,5 +1,5 @@
 {
-   "context" : "{ [] }",
+   "context" : "{  :  }",
    "name" : "for.cond4 => for.end14",
    "statements" : [
       {

diff --git a/polly/test/Cloog/CodeGen/MemAccess/simple_analyze.ll b/polly/test/Isl/CodeGen/MemAccess/simple_analyze.ll
similarity index 100%
rename from polly/test/Cloog/CodeGen/MemAccess/simple_analyze.ll
rename to polly/test/Isl/CodeGen/MemAccess/simple_analyze.ll