diff --git a/test_conformance/conversions/basic_test_conversions.cpp b/test_conformance/conversions/basic_test_conversions.cpp index ffdb948aca..43fb449bc4 100644 --- a/test_conformance/conversions/basic_test_conversions.cpp +++ b/test_conformance/conversions/basic_test_conversions.cpp @@ -406,7 +406,8 @@ cl_int CustomConversionsTest::Run() gMinVectorSize = 0; } - IterOverSelectedTypes iter(typeIterator, *this, inType, outType); + IterOverSelectedTypes iter(typeIterator, *this, inType, outType, round, + sat); iter.Run(); diff --git a/test_conformance/conversions/basic_test_conversions.h b/test_conformance/conversions/basic_test_conversions.h index aed0601be2..2314ee748b 100644 --- a/test_conformance/conversions/basic_test_conversions.h +++ b/test_conformance/conversions/basic_test_conversions.h @@ -317,9 +317,11 @@ struct IterOverTypes : public TestType struct IterOverSelectedTypes : public TestType { IterOverSelectedTypes(const TypeIter &typeIter, ConversionsTest &test, - const Type &in, const Type &out) - : inType(in), outType(out), typeIter(typeIter), test(test), - testNumber(-1), startMinVectorSize(gMinVectorSize) + const Type in, const Type out, + const RoundingMode round, const SaturationMode sat) + : inType(in), outType(out), rounding(round), saturation(sat), + typeIter(typeIter), test(test), testNumber(-1), + startMinVectorSize(gMinVectorSize) {} void Run() { for_each_out_elem(typeIter); } @@ -337,9 +339,9 @@ struct IterOverSelectedTypes : public TestType { if (testType(inType) && testType(outType)) { - // run the conversions - test.TestTypesConversion( - inType, outType, testNumber, startMinVectorSize); + // run selected conversion + // testing of the result will happen afterwards + test.DoTest(outType, inType, saturation, rounding); } } @@ -374,6 +376,9 @@ struct IterOverSelectedTypes : public TestType protected: Type inType; Type outType; + RoundingMode rounding; + SaturationMode saturation; + const TypeIter &typeIter; ConversionsTest &test; int testNumber;