tests: use --nowrap for constexpr diagnostics

Pass --nowrap to error-checking invocations and simplify FileCheck patterns now that diagnostics are not wrapped.

Author: dbabokin

tests/lit-tests/constexpr-aggregate-errors.ispc

@@ -1,5 +1,5 @@
 // REQUIRES: X86_ENABLED && X86_64_HOST
-// RUN: not %{ispc} %s --target=generic-i32x4 --nostdlib -o /dev/null 2>&1 | FileCheck %s
+// RUN: not %{ispc} %s --target=generic-i32x4 --nostdlib --nowrap -o /dev/null 2>&1 | FileCheck %s
 
 struct Pair {
     uniform int a;
@@ -13,23 +13,7 @@ constexpr uniform int<2> v2 = {1, 2};
 constexpr uniform int<2> bad_swizzle_char = v2.qy;
 constexpr uniform int<2> bad_swizzle_oob = v2.zw;
 
-// CHECK: Error:
-// CHECK: Initializer list
-// CHECK: for array
-// CHECK: "const uniform int32[2]"
-// CHECK: must have
-// CHECK: no more
-// CHECK: than 2
-// CHECK: elements
-// CHECK: (has 3).
-// CHECK: Error:
-// CHECK: Initializer list
-// CHECK: for struct
-// CHECK: "const uniform struct Pair"
-// CHECK: must
-// CHECK: have no
-// CHECK: more than 2
-// CHECK: elements
-// CHECK: (has 3).
-// CHECK: identifier "qy" unknown.
-// CHECK: character 'z' for constexpr vector.
+// CHECK: Error: Initializer list for array "const uniform int32[2]" must have no more than 2 elements (has 3).
+// CHECK: Error: Initializer list for struct "const uniform struct Pair" must have no more than 2 elements (has 3).
+// CHECK: Error: Vector element identifier "qy" unknown.
+// CHECK: Error: Invalid swizzle character 'z' for constexpr vector.

tests/lit-tests/constexpr-controlflow.ispc

@@ -1,4 +1,4 @@
-// RUN: not %{ispc} %s --target=host --nostdlib -o /dev/null 2>&1 | FileCheck %s
+// RUN: not %{ispc} %s --target=host --nostdlib --nowrap -o /dev/null 2>&1 | FileCheck %s
 
 constexpr uniform int bad(varying int x) {
     if (x > 0) {
@@ -7,6 +7,4 @@ constexpr uniform int bad(varying int x) {
     return 2;
 }
 
-// CHECK: Error:
-// CHECK: constexpr function
-// CHECK: "bad" requires a uniform condition in "if".
+// CHECK: Error: constexpr function "bad" requires a uniform condition in "if".

tests/lit-tests/constexpr-errors.ispc

@@ -1,4 +1,4 @@
-// RUN: not %{ispc} %s --target=host --nostdlib -o /dev/null 2>&1 | FileCheck %s
+// RUN: not %{ispc} %s --target=host --nostdlib --nowrap -o /dev/null 2>&1 | FileCheck %s
 
 uniform int g = 1;
 constexpr uniform int badinit = g;
@@ -13,21 +13,7 @@ constexpr uniform int badstmt(uniform int x) {
     return x;
 }
 
-// CHECK: Error:
-// CHECK: Initializer
-// CHECK: for global
-// CHECK: variable "badinit" must be a constant.
-// CHECK: Error:
-// CHECK: Missing
-// CHECK: initializer for
-// CHECK: constexpr variable "noinit".
-// CHECK: Error:
-// CHECK: constexpr
-// CHECK: function
-// CHECK: "badcall" calls non-constexpr function
-// CHECK: "nonconstexpr".
-// CHECK: Error:
-// CHECK: constexpr
-// CHECK: function
-// CHECK: "badstmt" contains disallowed statement
-// CHECK: "print".
+// CHECK: Error: Initializer for global variable "badinit" must be a constant.
+// CHECK: Error: Missing initializer for constexpr variable "noinit".
+// CHECK: Error: constexpr function "badcall" calls non-constexpr function "nonconstexpr".
+// CHECK: Error: constexpr function "badstmt" contains disallowed statement "print".

tests/lit-tests/constexpr-uniform-required.ispc

@@ -1,9 +1,7 @@
 // REQUIRES: X86_ENABLED && X86_64_HOST
-// RUN: not %{ispc} %s --target=generic-i32x4 -o /dev/null 2>&1 | FileCheck %s
+// RUN: not %{ispc} %s --target=generic-i32x4 --nowrap -o /dev/null 2>&1 | FileCheck %s
 
 constexpr varying int Lane = programIndex;
 uniform int arr[Lane];
 
-// CHECK: Error:
-// CHECK: Array size must
-// CHECK: be a uniform compile-time constant.
+// CHECK: Error: Array size must be a uniform compile-time constant.

tests/lit-tests/llvm-intrinsics-immarg-error.ispc

@@ -1,4 +1,4 @@
-// RUN: not %{ispc} %s --target=sse4.1-i32x4 --enable-llvm-intrinsics -o /dev/null 2>&1 | FileCheck %s
+// RUN: not %{ispc} %s --target=sse4.1-i32x4 --enable-llvm-intrinsics --nowrap -o /dev/null 2>&1 | FileCheck %s
 // REQUIRES: X86_ENABLED
 
 uniform int gMode = 3;
@@ -7,7 +7,4 @@ float bad_round(float v) {
     return @llvm.x86.sse41.round.ps(v, gMode);
 }
 
-// CHECK: Error:
-// CHECK: Immediate argument 2 to
-// CHECK: "llvm.x86.sse41.round.ps" must be a
-// CHECK: compile-time constant.
+// CHECK: Error: Immediate argument 2 to "llvm.x86.sse41.round.ps" must be a compile-time constant.