Workaround for outstanding LLVM assertions: Modify test cases.
This addresses problems that occur only with
FORCE_BUILD_LLVM_DISABLE_NDEBUG=true.
Modify test cases to work around http://b/65210157
temporary fix, removing pieces of the test cases).
Bug: 65210157
Test: with FORCE_BUILD_LLVM_DISABLE_NDEBUG=true, ran the modified test cases
Change-Id: Ib4f6b1b493b95b4fe8b3a7b3f92ee608fe239696
diff --git a/tests/P_reflection3264_divergent/ScriptC_reflection3264_divergent.java.expect b/tests/P_reflection3264_divergent/ScriptC_reflection3264_divergent.java.expect
index 9f1eefe..e71eaa3 100644
--- a/tests/P_reflection3264_divergent/ScriptC_reflection3264_divergent.java.expect
+++ b/tests/P_reflection3264_divergent/ScriptC_reflection3264_divergent.java.expect
@@ -43,20 +43,17 @@
__ALLOCATION = Element.ALLOCATION(rs);
__ScriptField_NonDivergent = ScriptField_NonDivergent.createElement(rs);
__ScriptField_Divergent = ScriptField_Divergent.createElement(rs);
- __ScriptField_DivergentNest = ScriptField_DivergentNest.createElement(rs);
}
private Element __@@INVALID@@;
private Element __ALLOCATION;
private Element __I32;
private Element __ScriptField_Divergent;
- private Element __ScriptField_DivergentNest;
private Element __ScriptField_NonDivergent;
private FieldPacker __rs_fp_@@INVALID@@;
private FieldPacker __rs_fp_ALLOCATION;
private FieldPacker __rs_fp_I32;
private FieldPacker __rs_fp_ScriptField_Divergent;
- private FieldPacker __rs_fp_ScriptField_DivergentNest;
private FieldPacker __rs_fp_ScriptField_NonDivergent;
private final static int mExportVarIdx_intVar = 0;
private int mExportVar_intVar;
@@ -263,63 +260,6 @@
return createFieldID(mExportVarIdx_dArray, null);
}
- private final static int mExportVarIdx_dnVar = 10;
- private ScriptField_DivergentNest.Item mExportVar_dnVar;
- public synchronized void set_dnVar(ScriptField_DivergentNest.Item v) {
- mExportVar_dnVar = v;
- FieldPacker fp = new FieldPacker(sIs64Bit ? 64 : 20);
- fp.addI32(v.x);
- fp.skip(sIs64Bit ? 4 : 0);
- fp.addI32(v.d.i);
- fp.skip(sIs64Bit ? 4 : 0);
- fp.addObj(v.d.a);
- fp.addI32(v.d.j);
- fp.skip(sIs64Bit ? 4 : 0);
- fp.addI32(v.y);
- fp.skip(sIs64Bit ? 4 : 0);
- int []__dimArr = new int[1];
- __dimArr[0] = 1;
- setVar(mExportVarIdx_dnVar, fp, __ScriptField_DivergentNest, __dimArr);
- }
-
- public ScriptField_DivergentNest.Item get_dnVar() {
- return mExportVar_dnVar;
- }
-
- public Script.FieldID getFieldID_dnVar() {
- return createFieldID(mExportVarIdx_dnVar, null);
- }
-
- private final static int mExportVarIdx_dnArray = 11;
- private ScriptField_DivergentNest.Item[] mExportVar_dnArray;
- public synchronized void set_dnArray(ScriptField_DivergentNest.Item[] v) {
- mExportVar_dnArray = v;
- FieldPacker fp = new FieldPacker(sIs64Bit ? 480 : 200);
- for (int ct1 = 0; ct1 < 10; ct1++) {
- fp.addI32(v[ct1].x);
- fp.skip(sIs64Bit ? 4 : 0);
- fp.addI32(v[ct1].d.i);
- fp.skip(sIs64Bit ? 4 : 0);
- fp.addObj(v[ct1].d.a);
- fp.addI32(v[ct1].d.j);
- fp.skip(sIs64Bit ? 4 : 0);
- fp.addI32(v[ct1].y);
- fp.skip(sIs64Bit ? 4 : 0);
- }
-
- int []__dimArr = new int[1];
- __dimArr[0] = 10;
- setVar(mExportVarIdx_dnArray, fp, __ScriptField_DivergentNest, __dimArr);
- }
-
- public ScriptField_DivergentNest.Item[] get_dnArray() {
- return mExportVar_dnArray;
- }
-
- public Script.FieldID getFieldID_dnArray() {
- return createFieldID(mExportVarIdx_dnArray, null);
- }
-
//private final static int mExportForEachIdx_root = 0;
private final static int mExportForEachIdx_dnFe = 1;
public Script.KernelID getKernelID_dnFe() {
diff --git a/tests/P_reflection3264_divergent/reflection3264_divergent.rs b/tests/P_reflection3264_divergent/reflection3264_divergent.rs
index 074c4f4..8677987 100644
--- a/tests/P_reflection3264_divergent/reflection3264_divergent.rs
+++ b/tests/P_reflection3264_divergent/reflection3264_divergent.rs
@@ -49,10 +49,16 @@
int y;
};
+#if 0
+
+// TODO: Add these variables back once http://b/65210157 is fixed
+
struct DivergentNest dnVar;
struct DivergentNest dnArray[10];
+#endif
+
void intFe(const int *in, int *out, const int *data) { }
void matFe(const int *in, int *out, const rs_matrix2x2 *data) { }
diff --git a/tests/P_reflection3264_divergent_support/ScriptC_reflection3264_divergent.java.expect b/tests/P_reflection3264_divergent_support/ScriptC_reflection3264_divergent.java.expect
index 6d68c35..b5a8ef2 100644
--- a/tests/P_reflection3264_divergent_support/ScriptC_reflection3264_divergent.java.expect
+++ b/tests/P_reflection3264_divergent_support/ScriptC_reflection3264_divergent.java.expect
@@ -40,20 +40,17 @@
__ALLOCATION = Element.ALLOCATION(rs);
__ScriptField_NonDivergent = ScriptField_NonDivergent.createElement(rs);
__ScriptField_Divergent = ScriptField_Divergent.createElement(rs);
- __ScriptField_DivergentNest = ScriptField_DivergentNest.createElement(rs);
}
private Element __@@INVALID@@;
private Element __ALLOCATION;
private Element __I32;
private Element __ScriptField_Divergent;
- private Element __ScriptField_DivergentNest;
private Element __ScriptField_NonDivergent;
private FieldPacker __rs_fp_@@INVALID@@;
private FieldPacker __rs_fp_ALLOCATION;
private FieldPacker __rs_fp_I32;
private FieldPacker __rs_fp_ScriptField_Divergent;
- private FieldPacker __rs_fp_ScriptField_DivergentNest;
private FieldPacker __rs_fp_ScriptField_NonDivergent;
private final static int mExportVarIdx_intVar = 0;
private int mExportVar_intVar;
@@ -260,63 +257,6 @@
return createFieldID(mExportVarIdx_dArray, null);
}
- private final static int mExportVarIdx_dnVar = 10;
- private ScriptField_DivergentNest.Item mExportVar_dnVar;
- public synchronized void set_dnVar(ScriptField_DivergentNest.Item v) {
- mExportVar_dnVar = v;
- FieldPacker fp = new FieldPacker((RenderScript.getPointerSize() == 8) ? 64 : 20);
- fp.addI32(v.x);
- fp.skip((RenderScript.getPointerSize() == 8) ? 4 : 0);
- fp.addI32(v.d.i);
- fp.skip((RenderScript.getPointerSize() == 8) ? 4 : 0);
- fp.addObj(v.d.a);
- fp.addI32(v.d.j);
- fp.skip((RenderScript.getPointerSize() == 8) ? 4 : 0);
- fp.addI32(v.y);
- fp.skip((RenderScript.getPointerSize() == 8) ? 4 : 0);
- int []__dimArr = new int[1];
- __dimArr[0] = 1;
- setVar(mExportVarIdx_dnVar, fp, __ScriptField_DivergentNest, __dimArr);
- }
-
- public ScriptField_DivergentNest.Item get_dnVar() {
- return mExportVar_dnVar;
- }
-
- public Script.FieldID getFieldID_dnVar() {
- return createFieldID(mExportVarIdx_dnVar, null);
- }
-
- private final static int mExportVarIdx_dnArray = 11;
- private ScriptField_DivergentNest.Item[] mExportVar_dnArray;
- public synchronized void set_dnArray(ScriptField_DivergentNest.Item[] v) {
- mExportVar_dnArray = v;
- FieldPacker fp = new FieldPacker((RenderScript.getPointerSize() == 8) ? 480 : 200);
- for (int ct1 = 0; ct1 < 10; ct1++) {
- fp.addI32(v[ct1].x);
- fp.skip((RenderScript.getPointerSize() == 8) ? 4 : 0);
- fp.addI32(v[ct1].d.i);
- fp.skip((RenderScript.getPointerSize() == 8) ? 4 : 0);
- fp.addObj(v[ct1].d.a);
- fp.addI32(v[ct1].d.j);
- fp.skip((RenderScript.getPointerSize() == 8) ? 4 : 0);
- fp.addI32(v[ct1].y);
- fp.skip((RenderScript.getPointerSize() == 8) ? 4 : 0);
- }
-
- int []__dimArr = new int[1];
- __dimArr[0] = 10;
- setVar(mExportVarIdx_dnArray, fp, __ScriptField_DivergentNest, __dimArr);
- }
-
- public ScriptField_DivergentNest.Item[] get_dnArray() {
- return mExportVar_dnArray;
- }
-
- public Script.FieldID getFieldID_dnArray() {
- return createFieldID(mExportVarIdx_dnArray, null);
- }
-
//private final static int mExportForEachIdx_root = 0;
private final static int mExportForEachIdx_dnFe = 1;
public Script.KernelID getKernelID_dnFe() {
diff --git a/tests/P_reflection3264_divergent_support/reflection3264_divergent.rs b/tests/P_reflection3264_divergent_support/reflection3264_divergent.rs
index 8eed21e..a77b119 100644
--- a/tests/P_reflection3264_divergent_support/reflection3264_divergent.rs
+++ b/tests/P_reflection3264_divergent_support/reflection3264_divergent.rs
@@ -51,10 +51,16 @@
int y;
};
+#if 0
+
+// TODO: Add these variables back once http://b/65210157 is fixed
+
struct DivergentNest dnVar;
struct DivergentNest dnArray[10];
+#endif
+
void intFe(const int *in, int *out, const int *data) { }
void matFe(const int *in, int *out, const rs_matrix2x2 *data) { }
