Skip to content

S
swiftshader
Commit 6d392374 by Eric Holk
Options

Subzero. ARM32. Enable more crosstests.

This removes most of the #ifndef ARM32 directives so we get more thorough testing. It still uses fewer iterations due to running on Qemu, but I did manually check to be sure that the tests pass without any special casing at all. BUG= https://bugs.chromium.org/p/nativeclient/issues/detail?id=4076 R=jpp@chromium.org, kschimpf@google.com Review URL: https://codereview.chromium.org/1708903002 .
parent 916e37ba
Showing with 0 additions and 24 deletions
crosstest/test_arith_main.cpp
...@@ -164,8 +164,6 @@ const static size_t MaxTestsPerFunc = 100000; ...@@ -164,8 +164,6 @@ const static size_t MaxTestsPerFunc = 100000;
template <typename TypeUnsignedLabel, typename TypeSignedLabel> template <typename TypeUnsignedLabel, typename TypeSignedLabel>
void testsVecInt(size_t &TotalTests, size_t &Passes, size_t &Failures) { void testsVecInt(size_t &TotalTests, size_t &Passes, size_t &Failures) {
#if !defined(ARM32)
// TODO(jpp): remove this once vector support is implemented.
typedef typename Vectors<TypeUnsignedLabel>::Ty TypeUnsigned; typedef typename Vectors<TypeUnsignedLabel>::Ty TypeUnsigned;
typedef typename Vectors<TypeSignedLabel>::Ty TypeSigned; typedef typename Vectors<TypeSignedLabel>::Ty TypeSigned;
typedef typename Vectors<TypeUnsignedLabel>::ElementTy ElementTypeUnsigned; typedef typename Vectors<TypeUnsignedLabel>::ElementTy ElementTypeUnsigned;
...@@ -241,7 +239,6 @@ void testsVecInt(size_t &TotalTests, size_t &Passes, size_t &Failures) { ...@@ -241,7 +239,6 @@ void testsVecInt(size_t &TotalTests, size_t &Passes, size_t &Failures) {
} }
} }
} }
#endif // !ARM32
} }
template <typename Type> template <typename Type>
...@@ -317,8 +314,6 @@ void testsFp(size_t &TotalTests, size_t &Passes, size_t &Failures) { ...@@ -317,8 +314,6 @@ void testsFp(size_t &TotalTests, size_t &Passes, size_t &Failures) {
} }
void testsVecFp(size_t &TotalTests, size_t &Passes, size_t &Failures) { void testsVecFp(size_t &TotalTests, size_t &Passes, size_t &Failures) {
#if !defined(ARM32)
// TODO(jpp): remove this once vector support is implemented.
static const float NegInf = -1.0 / 0.0; static const float NegInf = -1.0 / 0.0;
static const float PosInf = 1.0 / 0.0; static const float PosInf = 1.0 / 0.0;
static const float Nan = 0.0 / 0.0; static const float Nan = 0.0 / 0.0;
...@@ -377,7 +372,6 @@ void testsVecFp(size_t &TotalTests, size_t &Passes, size_t &Failures) { ...@@ -377,7 +372,6 @@ void testsVecFp(size_t &TotalTests, size_t &Passes, size_t &Failures) {
} }
} }
} }
#endif // !ARM32
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
......
crosstest/test_calling_conv.cpp
...@@ -66,8 +66,6 @@ void __attribute__((noinline)) callee_i(int arg1) { ...@@ -66,8 +66,6 @@ void __attribute__((noinline)) callee_i(int arg1) {
void __attribute__((noinline)) void __attribute__((noinline))
callee_vvvvv(v4si32 arg1, v4si32 arg2, v4si32 arg3, v4si32 arg4, v4si32 arg5) { callee_vvvvv(v4si32 arg1, v4si32 arg2, v4si32 arg3, v4si32 arg4, v4si32 arg5) {
#ifndef ARM32
// TODO(jpp): remove this once vector support is implemented.
switch (ArgNum) { switch (ArgNum) {
HANDLE_ARG(1); HANDLE_ARG(1);
HANDLE_ARG(2); HANDLE_ARG(2);
...@@ -75,7 +73,6 @@ callee_vvvvv(v4si32 arg1, v4si32 arg2, v4si32 arg3, v4si32 arg4, v4si32 arg5) { ...@@ -75,7 +73,6 @@ callee_vvvvv(v4si32 arg1, v4si32 arg2, v4si32 arg3, v4si32 arg4, v4si32 arg5) {
HANDLE_ARG(4); HANDLE_ARG(4);
HANDLE_ARG(5); HANDLE_ARG(5);
} }
#endif // ARM32
} }
void __attribute__((noinline)) void __attribute__((noinline))
...@@ -83,15 +80,12 @@ callee_vlvilvfvdviv(v4f32 arg1, int64 arg2, v4f32 arg3, int arg4, int64 arg5, ...@@ -83,15 +80,12 @@ callee_vlvilvfvdviv(v4f32 arg1, int64 arg2, v4f32 arg3, int arg4, int64 arg5,
v4f32 arg6, float arg7, v4f32 arg8, double arg9, v4f32 arg6, float arg7, v4f32 arg8, double arg9,
v4f32 arg10, int arg11, v4f32 arg12) { v4f32 arg10, int arg11, v4f32 arg12) {
switch (ArgNum) { switch (ArgNum) {
#ifndef ARM32
// TODO(jpp): remove this once vector support is implemented.
HANDLE_ARG(1); HANDLE_ARG(1);
HANDLE_ARG(3); HANDLE_ARG(3);
HANDLE_ARG(6); HANDLE_ARG(6);
HANDLE_ARG(8); HANDLE_ARG(8);
HANDLE_ARG(10); HANDLE_ARG(10);
HANDLE_ARG(12); HANDLE_ARG(12);
#endif // ARM32
HANDLE_ARG(2); HANDLE_ARG(2);
HANDLE_ARG(4); HANDLE_ARG(4);
HANDLE_ARG(5); HANDLE_ARG(5);
......
crosstest/test_cast_main.cpp
...@@ -92,8 +92,6 @@ void testValue(FromType Val, size_t &TotalTests, size_t &Passes, ...@@ -92,8 +92,6 @@ void testValue(FromType Val, size_t &TotalTests, size_t &Passes,
template <typename FromType, typename ToType> template <typename FromType, typename ToType>
void testVector(size_t &TotalTests, size_t &Passes, size_t &Failures, void testVector(size_t &TotalTests, size_t &Passes, size_t &Failures,
const char *FromTypeString, const char *ToTypeString) { const char *FromTypeString, const char *ToTypeString) {
#ifndef ARM32
// TODO(jpp): remove this once vector support is implemented.
const static size_t NumElementsInType = Vectors<FromType>::NumElements; const static size_t NumElementsInType = Vectors<FromType>::NumElements;
PRNG Index; PRNG Index;
static const float NegInf = -1.0 / 0.0; static const float NegInf = -1.0 / 0.0;
...@@ -111,7 +109,6 @@ void testVector(size_t &TotalTests, size_t &Passes, size_t &Failures, ...@@ -111,7 +109,6 @@ void testVector(size_t &TotalTests, size_t &Passes, size_t &Failures,
} }
COMPARE_VEC(cast, FromType, ToType, Value, FromTypeString, ToTypeString); COMPARE_VEC(cast, FromType, ToType, Value, FromTypeString, ToTypeString);
} }
#endif // ARM32
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
......
crosstest/test_fcmp_main.cpp
...@@ -158,8 +158,6 @@ void testsScalar(size_t &TotalTests, size_t &Passes, size_t &Failures) { ...@@ -158,8 +158,6 @@ void testsScalar(size_t &TotalTests, size_t &Passes, size_t &Failures) {
} }
void testsVector(size_t &TotalTests, size_t &Passes, size_t &Failures) { void testsVector(size_t &TotalTests, size_t &Passes, size_t &Failures) {
#ifndef ARM32
// TODO(jpp): remove this once vector support is implemented.
typedef v4si32 (*FuncTypeVector)(v4f32, v4f32); typedef v4si32 (*FuncTypeVector)(v4f32, v4f32);
static struct { static struct {
const char *Name; const char *Name;
...@@ -201,7 +199,6 @@ void testsVector(size_t &TotalTests, size_t &Passes, size_t &Failures) { ...@@ -201,7 +199,6 @@ void testsVector(size_t &TotalTests, size_t &Passes, size_t &Failures) {
} }
} }
} }
#endif // ARM32
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
......
crosstest/test_icmp_main.cpp
...@@ -198,8 +198,6 @@ const static size_t MaxTestsPerFunc = 100000; ...@@ -198,8 +198,6 @@ const static size_t MaxTestsPerFunc = 100000;
template <typename TypeUnsignedLabel, typename TypeSignedLabel> template <typename TypeUnsignedLabel, typename TypeSignedLabel>
void testsVecInt(size_t &TotalTests, size_t &Passes, size_t &Failures) { void testsVecInt(size_t &TotalTests, size_t &Passes, size_t &Failures) {
#if !defined(ARM32)
// TODO(jpp): remove this once vector support is implemented.
typedef typename Vectors<TypeUnsignedLabel>::Ty TypeUnsigned; typedef typename Vectors<TypeUnsignedLabel>::Ty TypeUnsigned;
typedef typename Vectors<TypeSignedLabel>::Ty TypeSigned; typedef typename Vectors<TypeSignedLabel>::Ty TypeSigned;
typedef typename Vectors<TypeUnsignedLabel>::ElementTy ElementTypeUnsigned; typedef typename Vectors<TypeUnsignedLabel>::ElementTy ElementTypeUnsigned;
...@@ -257,7 +255,6 @@ void testsVecInt(size_t &TotalTests, size_t &Passes, size_t &Failures) { ...@@ -257,7 +255,6 @@ void testsVecInt(size_t &TotalTests, size_t &Passes, size_t &Failures) {
} }
} }
} }
#endif // !ARM32
} }
// Return true on wraparound // Return true on wraparound
...@@ -278,8 +275,6 @@ incrementI1Vector(typename Vectors<T>::Ty &Vect) { ...@@ -278,8 +275,6 @@ incrementI1Vector(typename Vectors<T>::Ty &Vect) {
template <typename T> template <typename T>
void testsVecI1(size_t &TotalTests, size_t &Passes, size_t &Failures) { void testsVecI1(size_t &TotalTests, size_t &Passes, size_t &Failures) {
#if !defined(ARM32)
// TODO(jpp): remove this once vector support is implemented.
typedef typename Vectors<T>::Ty Ty; typedef typename Vectors<T>::Ty Ty;
typedef Ty (*FuncType)(Ty, Ty); typedef Ty (*FuncType)(Ty, Ty);
static struct { static struct {
...@@ -347,7 +342,6 @@ void testsVecI1(size_t &TotalTests, size_t &Passes, size_t &Failures) { ...@@ -347,7 +342,6 @@ void testsVecI1(size_t &TotalTests, size_t &Passes, size_t &Failures) {
} }
} }
} }
#endif // !ARM32
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment