Skip to content

S
swiftshader
Commit 92593eb2 by Nicolas Capens Committed by Nicolas Capens
Options

Fix more warnings treated as errors.

Fixes building SubzeroTest on Mac. Change-Id: I8ca1f2ea8101bec496b8e9741c38025ff932b3d6 Reviewed-on: https://swiftshader-review.googlesource.com/17189Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent da5320a5
Showing with 124 additions and 122 deletions
src/Reactor/Main.cpp
...@@ -483,62 +483,62 @@ TEST(SubzeroReactorTest, MinMax) ...@@ -483,62 +483,62 @@ TEST(SubzeroReactorTest, MinMax)
if(routine) if(routine)
{ {
int out[10][4]; unsigned int out[10][4];
memset(&out, 0, sizeof(out)); memset(&out, 0, sizeof(out));
int(*callable)(void*) = (int(*)(void*))routine->getEntry(); int(*callable)(void*) = (int(*)(void*))routine->getEntry();
callable(&out); callable(&out);
EXPECT_EQ(out[0][0], 0x00000000); EXPECT_EQ(out[0][0], 0x00000000u);
EXPECT_EQ(out[0][1], 0x00000000); EXPECT_EQ(out[0][1], 0x00000000u);
EXPECT_EQ(out[0][2], 0x00000000); EXPECT_EQ(out[0][2], 0x00000000u);
EXPECT_EQ(out[0][3], 0x80000000); EXPECT_EQ(out[0][3], 0x80000000u);
EXPECT_EQ(out[1][0], 0x3F800000); EXPECT_EQ(out[1][0], 0x3F800000u);
EXPECT_EQ(out[1][1], 0x3F800000); EXPECT_EQ(out[1][1], 0x3F800000u);
EXPECT_EQ(out[1][2], 0x00000000); EXPECT_EQ(out[1][2], 0x00000000u);
EXPECT_EQ(out[1][3], 0x80000000); EXPECT_EQ(out[1][3], 0x80000000u);
EXPECT_EQ(out[2][0], 0x00000000); EXPECT_EQ(out[2][0], 0x00000000u);
EXPECT_EQ(out[2][1], 0x00000000); EXPECT_EQ(out[2][1], 0x00000000u);
EXPECT_EQ(out[2][2], 0xFFFFFFFF); EXPECT_EQ(out[2][2], 0xFFFFFFFFu);
EXPECT_EQ(out[2][3], 0x00000000); EXPECT_EQ(out[2][3], 0x00000000u);
EXPECT_EQ(out[3][0], 0x00000001); EXPECT_EQ(out[3][0], 0x00000001u);
EXPECT_EQ(out[3][1], 0x00000001); EXPECT_EQ(out[3][1], 0x00000001u);
EXPECT_EQ(out[3][2], 0x00000000); EXPECT_EQ(out[3][2], 0x00000000u);
EXPECT_EQ(out[3][3], 0x00000000); EXPECT_EQ(out[3][3], 0x00000000u);
EXPECT_EQ(out[4][0], 0x00000000); EXPECT_EQ(out[4][0], 0x00000000u);
EXPECT_EQ(out[4][1], 0x00000000); EXPECT_EQ(out[4][1], 0x00000000u);
EXPECT_EQ(out[4][2], 0x00000000); EXPECT_EQ(out[4][2], 0x00000000u);
EXPECT_EQ(out[4][3], 0x00000000); EXPECT_EQ(out[4][3], 0x00000000u);
EXPECT_EQ(out[5][0], 0x00000001); EXPECT_EQ(out[5][0], 0x00000001u);
EXPECT_EQ(out[5][1], 0x00000001); EXPECT_EQ(out[5][1], 0x00000001u);
EXPECT_EQ(out[5][2], 0xFFFFFFFF); EXPECT_EQ(out[5][2], 0xFFFFFFFFu);
EXPECT_EQ(out[5][3], 0x00000000); EXPECT_EQ(out[5][3], 0x00000000u);
EXPECT_EQ(out[6][0], 0x00000000); EXPECT_EQ(out[6][0], 0x00000000u);
EXPECT_EQ(out[6][1], 0x0000FFFF); EXPECT_EQ(out[6][1], 0x0000FFFFu);
EXPECT_EQ(out[6][2], 0x00000000); EXPECT_EQ(out[6][2], 0x00000000u);
EXPECT_EQ(out[6][3], 0x00000000); EXPECT_EQ(out[6][3], 0x00000000u);
EXPECT_EQ(out[7][0], 0x00010001); EXPECT_EQ(out[7][0], 0x00010001u);
EXPECT_EQ(out[7][1], 0x00000000); EXPECT_EQ(out[7][1], 0x00000000u);
EXPECT_EQ(out[7][2], 0x00000000); EXPECT_EQ(out[7][2], 0x00000000u);
EXPECT_EQ(out[7][3], 0x00000000); EXPECT_EQ(out[7][3], 0x00000000u);
EXPECT_EQ(out[8][0], 0x00000000); EXPECT_EQ(out[8][0], 0x00000000u);
EXPECT_EQ(out[8][1], 0x00000000); EXPECT_EQ(out[8][1], 0x00000000u);
EXPECT_EQ(out[8][2], 0x00000000); EXPECT_EQ(out[8][2], 0x00000000u);
EXPECT_EQ(out[8][3], 0x00000000); EXPECT_EQ(out[8][3], 0x00000000u);
EXPECT_EQ(out[9][0], 0x00010001); EXPECT_EQ(out[9][0], 0x00010001u);
EXPECT_EQ(out[9][1], 0x0000FFFF); EXPECT_EQ(out[9][1], 0x0000FFFFu);
EXPECT_EQ(out[9][2], 0x00000000); EXPECT_EQ(out[9][2], 0x00000000u);
EXPECT_EQ(out[9][3], 0x00000000); EXPECT_EQ(out[9][3], 0x00000000u);
} }
} }
...@@ -654,38 +654,38 @@ TEST(SubzeroReactorTest, VectorCompare) ...@@ -654,38 +654,38 @@ TEST(SubzeroReactorTest, VectorCompare)
if(routine) if(routine)
{ {
int out[6][4]; unsigned int out[6][4];
memset(&out, 0, sizeof(out)); memset(&out, 0, sizeof(out));
int(*callable)(void*) = (int(*)(void*))routine->getEntry(); int(*callable)(void*) = (int(*)(void*))routine->getEntry();
callable(&out); callable(&out);
EXPECT_EQ(out[0][0], 0x00000000); EXPECT_EQ(out[0][0], 0x00000000u);
EXPECT_EQ(out[0][1], 0xFFFFFFFF); EXPECT_EQ(out[0][1], 0xFFFFFFFFu);
EXPECT_EQ(out[0][2], 0xFFFFFFFF); EXPECT_EQ(out[0][2], 0xFFFFFFFFu);
EXPECT_EQ(out[0][3], 0xFFFFFFFF); EXPECT_EQ(out[0][3], 0xFFFFFFFFu);
EXPECT_EQ(out[1][0], 0x00000000); EXPECT_EQ(out[1][0], 0x00000000u);
EXPECT_EQ(out[1][1], 0x00000000); EXPECT_EQ(out[1][1], 0x00000000u);
EXPECT_EQ(out[1][2], 0x00000000); EXPECT_EQ(out[1][2], 0x00000000u);
EXPECT_EQ(out[1][3], 0xFFFFFFFF); EXPECT_EQ(out[1][3], 0xFFFFFFFFu);
EXPECT_EQ(out[2][0], 0xFF000000); EXPECT_EQ(out[2][0], 0xFF000000u);
EXPECT_EQ(out[2][1], 0x00000000); EXPECT_EQ(out[2][1], 0x00000000u);
EXPECT_EQ(out[3][0], 0xFFFFFFFF); EXPECT_EQ(out[3][0], 0xFFFFFFFFu);
EXPECT_EQ(out[3][1], 0xFFFFFFFF); EXPECT_EQ(out[3][1], 0xFFFFFFFFu);
EXPECT_EQ(out[3][2], 0xFFFFFFFF); EXPECT_EQ(out[3][2], 0xFFFFFFFFu);
EXPECT_EQ(out[3][3], 0xFFFFFFFF); EXPECT_EQ(out[3][3], 0xFFFFFFFFu);
EXPECT_EQ(out[4][0], 0xFFFFFFFF); EXPECT_EQ(out[4][0], 0xFFFFFFFFu);
EXPECT_EQ(out[4][1], 0x00000000); EXPECT_EQ(out[4][1], 0x00000000u);
EXPECT_EQ(out[4][2], 0x00000000); EXPECT_EQ(out[4][2], 0x00000000u);
EXPECT_EQ(out[4][3], 0xFFFFFFFF); EXPECT_EQ(out[4][3], 0xFFFFFFFFu);
EXPECT_EQ(out[5][0], 0x00000000); EXPECT_EQ(out[5][0], 0x00000000u);
EXPECT_EQ(out[5][1], 0xFFFFFFFF); EXPECT_EQ(out[5][1], 0xFFFFFFFFu);
} }
} }
...@@ -751,54 +751,54 @@ TEST(SubzeroReactorTest, SaturatedAddAndSubtract) ...@@ -751,54 +751,54 @@ TEST(SubzeroReactorTest, SaturatedAddAndSubtract)
if(routine) if(routine)
{ {
int out[14][2]; unsigned int out[14][2];
memset(&out, 0, sizeof(out)); memset(&out, 0, sizeof(out));
int(*callable)(void*) = (int(*)(void*))routine->getEntry(); int(*callable)(void*) = (int(*)(void*))routine->getEntry();
callable(&out); callable(&out);
EXPECT_EQ(out[0][0], 0x08080808); EXPECT_EQ(out[0][0], 0x08080808u);
EXPECT_EQ(out[0][1], 0x08080808); EXPECT_EQ(out[0][1], 0x08080808u);
EXPECT_EQ(out[1][0], 0xFFFFFFFF); EXPECT_EQ(out[1][0], 0xFFFFFFFFu);
EXPECT_EQ(out[1][1], 0xFEFFFFFF); EXPECT_EQ(out[1][1], 0xFEFFFFFFu);
EXPECT_EQ(out[2][0], 0x00000000); EXPECT_EQ(out[2][0], 0x00000000u);
EXPECT_EQ(out[2][1], 0x08060402); EXPECT_EQ(out[2][1], 0x08060402u);
EXPECT_EQ(out[3][0], 0x08080808); EXPECT_EQ(out[3][0], 0x08080808u);
EXPECT_EQ(out[3][1], 0x08080808); EXPECT_EQ(out[3][1], 0x08080808u);
EXPECT_EQ(out[4][0], 0x7F7F7F7F); EXPECT_EQ(out[4][0], 0x7F7F7F7Fu);
EXPECT_EQ(out[4][1], 0x7E7F7F7F); EXPECT_EQ(out[4][1], 0x7E7F7F7Fu);
EXPECT_EQ(out[5][0], 0x80808080); EXPECT_EQ(out[5][0], 0x80808080u);
EXPECT_EQ(out[5][1], 0x88868482); EXPECT_EQ(out[5][1], 0x88868482u);
EXPECT_EQ(out[6][0], 0x80808080); EXPECT_EQ(out[6][0], 0x80808080u);
EXPECT_EQ(out[6][1], 0x88868482); EXPECT_EQ(out[6][1], 0x88868482u);
EXPECT_EQ(out[7][0], 0x00040004); EXPECT_EQ(out[7][0], 0x00040004u);
EXPECT_EQ(out[7][1], 0x00040004); EXPECT_EQ(out[7][1], 0x00040004u);
EXPECT_EQ(out[8][0], 0x7FFF7FFF); EXPECT_EQ(out[8][0], 0x7FFF7FFFu);
EXPECT_EQ(out[8][1], 0x7FFE7FFF); EXPECT_EQ(out[8][1], 0x7FFE7FFFu);
EXPECT_EQ(out[9][0], 0x80008000); EXPECT_EQ(out[9][0], 0x80008000u);
EXPECT_EQ(out[9][1], 0x80048002); EXPECT_EQ(out[9][1], 0x80048002u);
EXPECT_EQ(out[10][0], 0x80008000); EXPECT_EQ(out[10][0], 0x80008000u);
EXPECT_EQ(out[10][1], 0x80048002); EXPECT_EQ(out[10][1], 0x80048002u);
EXPECT_EQ(out[11][0], 0x00040004); EXPECT_EQ(out[11][0], 0x00040004u);
EXPECT_EQ(out[11][1], 0x00040004); EXPECT_EQ(out[11][1], 0x00040004u);
EXPECT_EQ(out[12][0], 0xFFFFFFFF); EXPECT_EQ(out[12][0], 0xFFFFFFFFu);
EXPECT_EQ(out[12][1], 0xFFFEFFFF); EXPECT_EQ(out[12][1], 0xFFFEFFFFu);
EXPECT_EQ(out[13][0], 0x00000000); EXPECT_EQ(out[13][0], 0x00000000u);
EXPECT_EQ(out[13][1], 0x00040002); EXPECT_EQ(out[13][1], 0x00040002u);
} }
} }
...@@ -830,22 +830,22 @@ TEST(SubzeroReactorTest, Unpack) ...@@ -830,22 +830,22 @@ TEST(SubzeroReactorTest, Unpack)
if(routine) if(routine)
{ {
int in[1][2]; unsigned int in[1][2];
int out[2][2]; unsigned int out[2][2];
memset(&out, 0, sizeof(out)); memset(&out, 0, sizeof(out));
in[0][0] = 0xABCDEF12; in[0][0] = 0xABCDEF12u;
in[0][1] = 0x34567890; in[0][1] = 0x34567890u;
int(*callable)(void*,void*) = (int(*)(void*,void*))routine->getEntry(); int(*callable)(void*,void*) = (int(*)(void*,void*))routine->getEntry();
callable(&in, &out); callable(&in, &out);
EXPECT_EQ(out[0][0], 0x78EF9012); EXPECT_EQ(out[0][0], 0x78EF9012u);
EXPECT_EQ(out[0][1], 0x34AB56CD); EXPECT_EQ(out[0][1], 0x34AB56CDu);
EXPECT_EQ(out[1][0], 0xEFEF1212); EXPECT_EQ(out[1][0], 0xEFEF1212u);
EXPECT_EQ(out[1][1], 0xABABCDCD); EXPECT_EQ(out[1][1], 0xABABCDCDu);
} }
} }
...@@ -884,37 +884,38 @@ TEST(SubzeroReactorTest, Pack) ...@@ -884,37 +884,38 @@ TEST(SubzeroReactorTest, Pack)
if(routine) if(routine)
{ {
int out[6][2]; unsigned int out[6][2];
memset(&out, 0, sizeof(out)); memset(&out, 0, sizeof(out));
int(*callable)(void*) = (int(*)(void*))routine->getEntry(); int(*callable)(void*) = (int(*)(void*))routine->getEntry();
callable(&out); callable(&out);
EXPECT_EQ(out[0][0], 0x0201FEFF); EXPECT_EQ(out[0][0], 0x0201FEFFu);
EXPECT_EQ(out[0][1], 0xFCFD0403); EXPECT_EQ(out[0][1], 0xFCFD0403u);
EXPECT_EQ(out[1][0], 0x02010000); EXPECT_EQ(out[1][0], 0x02010000u);
EXPECT_EQ(out[1][1], 0x00000403); EXPECT_EQ(out[1][1], 0x00000403u);
EXPECT_EQ(out[2][0], 0xFFFEFFFF); EXPECT_EQ(out[2][0], 0xFFFEFFFFu);
EXPECT_EQ(out[2][1], 0x00020001); EXPECT_EQ(out[2][1], 0x00020001u);
EXPECT_EQ(out[3][0], 0x00040003); EXPECT_EQ(out[3][0], 0x00040003u);
EXPECT_EQ(out[3][1], 0xFFFCFFFD); EXPECT_EQ(out[3][1], 0xFFFCFFFDu);
EXPECT_EQ(out[4][0], 0x00000000); EXPECT_EQ(out[4][0], 0x00000000u);
EXPECT_EQ(out[4][1], 0x00020001); EXPECT_EQ(out[4][1], 0x00020001u);
EXPECT_EQ(out[5][0], 0x00040003); EXPECT_EQ(out[5][0], 0x00040003u);
EXPECT_EQ(out[5][1], 0x00000000); EXPECT_EQ(out[5][1], 0x00000000u);
} }
} }
delete routine; delete routine;
} }
TEST(SubzeroReactorTest, MulHigh) { TEST(SubzeroReactorTest, MulHigh)
{
Routine *routine = nullptr; Routine *routine = nullptr;
{ {
...@@ -937,25 +938,26 @@ TEST(SubzeroReactorTest, MulHigh) { ...@@ -937,25 +938,26 @@ TEST(SubzeroReactorTest, MulHigh) {
if(routine) if(routine)
{ {
int out[2][2]; unsigned int out[2][2];
memset(&out, 0, sizeof(out)); memset(&out, 0, sizeof(out));
int(*callable)(void*) = (int(*)(void*))routine->getEntry(); int(*callable)(void*) = (int(*)(void*))routine->getEntry();
callable(&out); callable(&out);
EXPECT_EQ((unsigned)out[0][0], 0x00080002); EXPECT_EQ(out[0][0], 0x00080002u);
EXPECT_EQ((unsigned)out[0][1], 0x008d000f); EXPECT_EQ(out[0][1], 0x008D000fu);
EXPECT_EQ((unsigned)out[1][0], 0x00080002); EXPECT_EQ(out[1][0], 0x00080002u);
EXPECT_EQ((unsigned)out[1][1], 0xe8c0000f); EXPECT_EQ(out[1][1], 0xe8C0000Fu);
} }
} }
delete routine; delete routine;
} }
TEST(SubzeroReactorTest, MulAdd) { TEST(SubzeroReactorTest, MulAdd)
{
Routine *routine = nullptr; Routine *routine = nullptr;
{ {
...@@ -975,15 +977,15 @@ TEST(SubzeroReactorTest, MulAdd) { ...@@ -975,15 +977,15 @@ TEST(SubzeroReactorTest, MulAdd) {
if(routine) if(routine)
{ {
int out[1][2]; unsigned int out[1][2];
memset(&out, 0, sizeof(out)); memset(&out, 0, sizeof(out));
int(*callable)(void*) = (int(*)(void*))routine->getEntry(); int(*callable)(void*) = (int(*)(void*))routine->getEntry();
callable(&out); callable(&out);
EXPECT_EQ((unsigned)out[0][0], 0x000ae34a); EXPECT_EQ(out[0][0], 0x000AE34Au);
EXPECT_EQ((unsigned)out[0][1], 0x009d5254); EXPECT_EQ(out[0][1], 0x009D5254u);
} }
} }
......
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