[polly] r310599 - [JSON] Make the failure to parse a jscop file a hard error
Philip Pfaffe via llvm-commits
llvm-commits at lists.llvm.org
Thu Aug 10 07:53:25 PDT 2017
Author: pfaffe
Date: Thu Aug 10 07:53:25 2017
New Revision: 310599
URL: http://llvm.org/viewvc/llvm-project?rev=310599&view=rev
Log:
[JSON] Make the failure to parse a jscop file a hard error
Summary:
Before, if we fail to parse a jscop file, this will be reported as an
error and importing is aborted. However, this isn't actually strong
enough, since although the import is aborted, the scop has already been
modified and is very likely broken. Instead, make this a hard failure
and throw an LLVM error. This new behaviour requires small changes to
the tests for the legacy pass, namely using `not` to verify the error.
Further, fixed the jscop file for the
base_pointer_load_is_inst_inside_invariant_1 testcase.
Reviewed By: Meinersbur
Split out of D36578.
Modified:
polly/trunk/lib/Exchange/JSONExporter.cpp
polly/trunk/test/Isl/CodeGen/MemAccess/bad_alignment.ll
polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Bad-relation.ll
polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-No-accesses-key.ll
polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Not-enough-MemAcc.ll
polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Not-enough-statements.ll
polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Relation-mispelled.ll
polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Statements-mispelled.ll
polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Undeclared-ScopArrayInfo.ll
polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Wrong-number-dimensions.ll
polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-Mispelled-type.ll
polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-Negative-size.ll
polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-No-name.ll
polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-No-sizes-key.ll
polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-No-type-key.ll
polly/trunk/test/JSONExporter/ImportContext/ImportContext-Context-mispelled.ll
polly/trunk/test/JSONExporter/ImportContext/ImportContext-Not-parameter-set.ll
polly/trunk/test/JSONExporter/ImportContext/ImportContext-Unvalid-Context.ll
polly/trunk/test/JSONExporter/ImportContext/ImportContext-Wrong-dimension.ll
polly/trunk/test/JSONExporter/ImportSchedule/ImportSchedule-No-schedule-key.ll
polly/trunk/test/JSONExporter/ImportSchedule/ImportSchedule-Schedule-not-valid.ll
polly/trunk/test/JSONExporter/ImportSchedule/ImportSchedule-Statements-mispelled.ll
polly/trunk/test/JSONExporter/ImportSchedule/ImportSchedule-Wrong-number-statements.ll
polly/trunk/test/ScopDetect/base_pointer_load_is_inst_inside_invariant_1___%for.i---%exit.jscop
polly/trunk/test/Simplify/notredundant_region_middle.ll
Modified: polly/trunk/lib/Exchange/JSONExporter.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Exchange/JSONExporter.cpp?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/lib/Exchange/JSONExporter.cpp (original)
+++ polly/trunk/lib/Exchange/JSONExporter.cpp Thu Aug 10 07:53:25 2017
@@ -388,7 +388,8 @@ importAccesses(Scop &S, Json::Value &JSc
return false;
}
- // Check whether the number of indices equals the number of memory accesses
+ // Check whether the number of indices equals the number of memory
+ // accesses
if (Stmt.size() != statements[StatementIdx]["accesses"].size()) {
errs() << "The number of memory accesses in the JSop file and the number "
"of memory accesses differ for index "
@@ -430,8 +431,8 @@ importAccesses(Scop &S, Json::Value &JSc
// If the NewAccessMap has zero dimensions, it is the scalar access; it
// must be the same as before.
- // If it has at least one dimension, it's an array access; search for its
- // ScopArrayInfo.
+ // If it has at least one dimension, it's an array access; search for
+ // its ScopArrayInfo.
if (isl_map_dim(NewAccessMap, isl_dim_out) >= 1) {
NewOutId = isl_map_get_tuple_id(NewAccessMap, isl_dim_out);
auto *SAI = S.getArrayInfoByName(isl_id_get_name(NewOutId));
@@ -781,7 +782,10 @@ bool JSONImporter::runOnScop(Scop &S) {
const Dependences &D =
getAnalysis<DependenceInfo>().getDependences(Dependences::AL_Statement);
const DataLayout &DL = S.getFunction().getParent()->getDataLayout();
- importScop(S, D, DL, &NewAccessStrings);
+
+ if (!importScop(S, D, DL, &NewAccessStrings))
+ report_fatal_error("Tried to import a malformed jscop file.");
+
return false;
}
@@ -800,7 +804,8 @@ PreservedAnalyses JSONImportPass::run(Sc
Dependences::AL_Statement);
const DataLayout &DL = S.getFunction().getParent()->getDataLayout();
- importScop(S, D, DL);
+ if (!importScop(S, D, DL))
+ report_fatal_error("Tried to import a malformed jscop file.");
// This invalidates all analyses on Scop.
PreservedAnalyses PA;
Modified: polly/trunk/test/Isl/CodeGen/MemAccess/bad_alignment.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Isl/CodeGen/MemAccess/bad_alignment.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/Isl/CodeGen/MemAccess/bad_alignment.ll (original)
+++ polly/trunk/test/Isl/CodeGen/MemAccess/bad_alignment.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-import-jscop -analyze 2>&1 < %s | FileCheck %s
+; RUN: not opt %loadPolly -polly-import-jscop -analyze 2>&1 < %s | FileCheck %s
;
; Check that we do not allow to access elements not accessed before because the
; alignment information would become invalid.
Modified: polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Bad-relation.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Bad-relation.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Bad-relation.ll (original)
+++ polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Bad-relation.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: not opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
;
; CHECK: The access was not parsed successfully by ISL.
;
Modified: polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-No-accesses-key.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-No-accesses-key.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-No-accesses-key.ll (original)
+++ polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-No-accesses-key.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: not opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
;
; CHECK: Statement from JScop file has no key name 'accesses' for index 1.
;
Modified: polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Not-enough-MemAcc.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Not-enough-MemAcc.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Not-enough-MemAcc.ll (original)
+++ polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Not-enough-MemAcc.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: not opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
;
; CHECK: The number of memory accesses in the JSop file and the number of memory accesses differ for index 0.
;
Modified: polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Not-enough-statements.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Not-enough-statements.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Not-enough-statements.ll (original)
+++ polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Not-enough-statements.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: not opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
;
; CHECK: The number of indices and the number of statements differ.
;
Modified: polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Relation-mispelled.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Relation-mispelled.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Relation-mispelled.ll (original)
+++ polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Relation-mispelled.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: not opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
;
; CHECK: Memory access number 0 has no key name 'relation' for statement number 1.
;
Modified: polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Statements-mispelled.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Statements-mispelled.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Statements-mispelled.ll (original)
+++ polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Statements-mispelled.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: not opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
;
; CHECK: JScop file has no key name 'statements'.
;
Modified: polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Undeclared-ScopArrayInfo.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Undeclared-ScopArrayInfo.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Undeclared-ScopArrayInfo.ll (original)
+++ polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Undeclared-ScopArrayInfo.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: not opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
;
; CHECK: JScop file contains access function with undeclared ScopArrayInfo
;
Modified: polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Wrong-number-dimensions.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Wrong-number-dimensions.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Wrong-number-dimensions.ll (original)
+++ polly/trunk/test/JSONExporter/ImportAccesses/ImportAccesses-Wrong-number-dimensions.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: not opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
;
; CHECK: JScop file changes the number of parameter dimensions.
;
Modified: polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-Mispelled-type.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-Mispelled-type.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-Mispelled-type.ll (original)
+++ polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-Mispelled-type.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-scops -analyze -polly-import-jscop -polly-import-jscop-postfix=transformed < %s 2>&1 | FileCheck %s
+ ; RUN: not opt %loadPolly -polly-scops -analyze -polly-import-jscop -polly-import-jscop-postfix=transformed < %s 2>&1 | FileCheck %s
;
; CHECK: Array has not a valid type.
;
Modified: polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-Negative-size.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-Negative-size.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-Negative-size.ll (original)
+++ polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-Negative-size.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-scops -analyze -polly-import-jscop -polly-import-jscop-postfix=transformed < %s 2>&1 | FileCheck %s
+; RUN: not opt %loadPolly -polly-scops -analyze -polly-import-jscop -polly-import-jscop-postfix=transformed < %s 2>&1 | FileCheck %s
;
; #define Ni 1056
; #define Nj 1056
Modified: polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-No-name.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-No-name.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-No-name.ll (original)
+++ polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-No-name.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-scops -analyze -polly-import-jscop -polly-import-jscop-postfix=transformed < %s 2>&1 | FileCheck %s
+; RUN: not opt %loadPolly -polly-scops -analyze -polly-import-jscop -polly-import-jscop-postfix=transformed < %s 2>&1 | FileCheck %s
;
; CHECK: Array has no key 'name'.
;
Modified: polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-No-sizes-key.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-No-sizes-key.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-No-sizes-key.ll (original)
+++ polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-No-sizes-key.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-scops -analyze -polly-import-jscop -polly-import-jscop-postfix=transformed < %s 2>&1 | FileCheck %s
+; RUN: not opt %loadPolly -polly-scops -analyze -polly-import-jscop -polly-import-jscop-postfix=transformed < %s 2>&1 | FileCheck %s
;
; CHECK: Array has no key 'sizes'.
;
Modified: polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-No-type-key.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-No-type-key.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-No-type-key.ll (original)
+++ polly/trunk/test/JSONExporter/ImportArrays/ImportArrays-No-type-key.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-scops -analyze -polly-import-jscop -polly-import-jscop-postfix=transformed < %s 2>&1 | FileCheck %s
+; RUN: not opt %loadPolly -polly-scops -analyze -polly-import-jscop -polly-import-jscop-postfix=transformed < %s 2>&1 | FileCheck %s
;
; CHECK: Array has no key 'type'.
;
Modified: polly/trunk/test/JSONExporter/ImportContext/ImportContext-Context-mispelled.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportContext/ImportContext-Context-mispelled.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportContext/ImportContext-Context-mispelled.ll (original)
+++ polly/trunk/test/JSONExporter/ImportContext/ImportContext-Context-mispelled.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: not opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
;
; CHECK: JScop file has no key named 'context'.
;
Modified: polly/trunk/test/JSONExporter/ImportContext/ImportContext-Not-parameter-set.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportContext/ImportContext-Not-parameter-set.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportContext/ImportContext-Not-parameter-set.ll (original)
+++ polly/trunk/test/JSONExporter/ImportContext/ImportContext-Not-parameter-set.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel -analyze < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: not opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel -analyze < %s 2>&1 >/dev/null | FileCheck %s
;
; CHECK: The isl_set is not a parameter set.
;
Modified: polly/trunk/test/JSONExporter/ImportContext/ImportContext-Unvalid-Context.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportContext/ImportContext-Unvalid-Context.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportContext/ImportContext-Unvalid-Context.ll (original)
+++ polly/trunk/test/JSONExporter/ImportContext/ImportContext-Unvalid-Context.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: not opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
;
; CHECK: The context was not parsed successfully by ISL.
;
Modified: polly/trunk/test/JSONExporter/ImportContext/ImportContext-Wrong-dimension.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportContext/ImportContext-Wrong-dimension.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportContext/ImportContext-Wrong-dimension.ll (original)
+++ polly/trunk/test/JSONExporter/ImportContext/ImportContext-Wrong-dimension.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: not opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
;
; CHECK: Imported context has the wrong number of parameters : Found 2 Expected 1
;
Modified: polly/trunk/test/JSONExporter/ImportSchedule/ImportSchedule-No-schedule-key.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportSchedule/ImportSchedule-No-schedule-key.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportSchedule/ImportSchedule-No-schedule-key.ll (original)
+++ polly/trunk/test/JSONExporter/ImportSchedule/ImportSchedule-No-schedule-key.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: not opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
;
; CHECK: Statement 0 has no 'schedule' key.
;
Modified: polly/trunk/test/JSONExporter/ImportSchedule/ImportSchedule-Schedule-not-valid.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportSchedule/ImportSchedule-Schedule-not-valid.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportSchedule/ImportSchedule-Schedule-not-valid.ll (original)
+++ polly/trunk/test/JSONExporter/ImportSchedule/ImportSchedule-Schedule-not-valid.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: not opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
;
; CHECK: The schedule was not parsed successfully (index = 1).
;
Modified: polly/trunk/test/JSONExporter/ImportSchedule/ImportSchedule-Statements-mispelled.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportSchedule/ImportSchedule-Statements-mispelled.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportSchedule/ImportSchedule-Statements-mispelled.ll (original)
+++ polly/trunk/test/JSONExporter/ImportSchedule/ImportSchedule-Statements-mispelled.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: not opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
;
; CHECK: JScop file has no key name 'statements'.
;
Modified: polly/trunk/test/JSONExporter/ImportSchedule/ImportSchedule-Wrong-number-statements.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/JSONExporter/ImportSchedule/ImportSchedule-Wrong-number-statements.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/JSONExporter/ImportSchedule/ImportSchedule-Wrong-number-statements.ll (original)
+++ polly/trunk/test/JSONExporter/ImportSchedule/ImportSchedule-Wrong-number-statements.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
+; RUN: not opt %loadPolly -polly-import-jscop -polly-ast -polly-ast-detect-parallel < %s 2>&1 >/dev/null | FileCheck %s
;
; CHECK: The number of indices and the number of statements differ.
;
Modified: polly/trunk/test/ScopDetect/base_pointer_load_is_inst_inside_invariant_1___%for.i---%exit.jscop
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopDetect/base_pointer_load_is_inst_inside_invariant_1___%25for.i---%25exit.jscop?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/ScopDetect/base_pointer_load_is_inst_inside_invariant_1___%for.i---%exit.jscop (original)
+++ polly/trunk/test/ScopDetect/base_pointer_load_is_inst_inside_invariant_1___%for.i---%exit.jscop Thu Aug 10 07:53:25 2017
@@ -17,10 +17,6 @@
{
"accesses" : [
{
- "kind" : "read",
- "relation" : "[n] -> { Stmt_S1[i0] -> MemRef_A[0] }"
- },
- {
"kind" : "write",
"relation" : "[n] -> { Stmt_S1[i0] -> MemRef_ptr[i0+1] }"
}
Modified: polly/trunk/test/Simplify/notredundant_region_middle.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Simplify/notredundant_region_middle.ll?rev=310599&r1=310598&r2=310599&view=diff
==============================================================================
--- polly/trunk/test/Simplify/notredundant_region_middle.ll (original)
+++ polly/trunk/test/Simplify/notredundant_region_middle.ll Thu Aug 10 07:53:25 2017
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-import-jscop -polly-import-jscop-postfix=transformed -polly-simplify -analyze < %s | FileCheck %s -match-full-lines
+; RUN: opt %loadPolly -polly-simplify -analyze < %s | FileCheck %s -match-full-lines
;
; Do not remove redundant stores in the middle of region statements.
; The store in region_true could be removed, but in practice we do try to
More information about the llvm-commits
mailing list