From b5d1c322f2be1d440e1517dd2db175823c3e1e1f Mon Sep 17 00:00:00 2001
From: Johannes Doerfert <jdoerfert@codeaurora.org>
Date: Sun, 3 Aug 2014 01:48:49 +0000
Subject: [PATCH] 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
---
 .../test/{Cloog => Isl}/CodeGen/MemAccess/codegen_constant_offset.ll  | 2 +-
 .../MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop    | 2 +-
 .../codegen_constant_offset___%for.cond---%for.end.jscop.transformed  | 2 +-
 polly/test/{Cloog => Isl}/CodeGen/MemAccess/codegen_simple.ll         | 2 +-
 .../CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop     | 2 +-
 .../MemAccess/codegen_simple___%for.cond---%for.end.jscop.transformed | 2 +-
 polly/test/{Cloog => Isl}/CodeGen/MemAccess/codegen_simple_md.ll      | 4 ++--
 .../CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop | 0
 ...egen_simple_md___%for.cond---%for.end6.jscop.transformed+withconst | 0
 ...n_simple_md___%for.cond---%for.end6.jscop.transformed+withoutconst | 0
 polly/test/{Cloog => Isl}/CodeGen/MemAccess/simple.ll                 | 0
 .../CodeGen/MemAccess/simple___%for.cond---%for.end.jscop             | 2 +-
 .../CodeGen/MemAccess/simple___%for.cond---%for.end.jscop.transformed | 2 +-
 .../CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop          | 2 +-
 .../MemAccess/simple___%for.cond4---%for.end14.jscop.transformed      | 2 +-
 polly/test/{Cloog => Isl}/CodeGen/MemAccess/simple_analyze.ll         | 0
 16 files changed, 12 insertions(+), 12 deletions(-)
 rename polly/test/{Cloog => Isl}/CodeGen/MemAccess/codegen_constant_offset.ll (93%)
 rename polly/test/{Cloog => Isl}/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop (96%)
 rename polly/test/{Cloog => Isl}/CodeGen/MemAccess/codegen_constant_offset___%for.cond---%for.end.jscop.transformed (96%)
 rename polly/test/{Cloog => Isl}/CodeGen/MemAccess/codegen_simple.ll (93%)
 rename polly/test/{Cloog => Isl}/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop (96%)
 rename polly/test/{Cloog => Isl}/CodeGen/MemAccess/codegen_simple___%for.cond---%for.end.jscop.transformed (96%)
 rename polly/test/{Cloog => Isl}/CodeGen/MemAccess/codegen_simple_md.ll (96%)
 rename polly/test/{Cloog => Isl}/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop (100%)
 rename polly/test/{Cloog => Isl}/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop.transformed+withconst (100%)
 rename polly/test/{Cloog => Isl}/CodeGen/MemAccess/codegen_simple_md___%for.cond---%for.end6.jscop.transformed+withoutconst (100%)
 rename polly/test/{Cloog => Isl}/CodeGen/MemAccess/simple.ll (100%)
 rename polly/test/{Cloog => Isl}/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop (94%)
 rename polly/test/{Cloog => Isl}/CodeGen/MemAccess/simple___%for.cond---%for.end.jscop.transformed (94%)
 rename polly/test/{Cloog => Isl}/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop (94%)
 rename polly/test/{Cloog => Isl}/CodeGen/MemAccess/simple___%for.cond4---%for.end14.jscop.transformed (94%)
 rename polly/test/{Cloog => Isl}/CodeGen/MemAccess/simple_analyze.ll (100%)

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
--- 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
--- 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
--- 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 3119ed4d..8fd660a 100644
--- 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
--- 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
--- 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..8b220189 100644
--- 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
--- 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
--- 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
--- 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
--- 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
-- 
2.7.4