Skip to content

S
swiftshader
Commit 0e7e412e by Karl Schimpf
Options

Fix instruction unit tests to use new editing constants.

Fixes code to follow new editing constants in class NaClMungedBitcode rather than obsolete editing constants in class NaClBitcodeMunger. BUG=None R=jvoung@chromium.org Review URL: https://codereview.chromium.org/1120853002
parent 90ccc3fa
Showing with 16 additions and 16 deletions
unittest/IceParseInstsTest.cpp
...@@ -107,7 +107,7 @@ TEST(IceParseInstsTests, AllocaAlignment) { ...@@ -107,7 +107,7 @@ TEST(IceParseInstsTests, AllocaAlignment) {
// Show what happens when changing alignment to 0. // Show what happens when changing alignment to 0.
const uint64_t Align0[] = { const uint64_t Align0[] = {
ReplaceIndex, NaClBitcodeMunger::Replace, ReplaceIndex, NaClMungedBitcode::Replace,
3, naclbitc::FUNC_CODE_INST_ALLOCA, 1, getEncAlignZero(), Terminator, 3, naclbitc::FUNC_CODE_INST_ALLOCA, 1, getEncAlignZero(), Terminator,
}; };
EXPECT_TRUE(Munger.runTest("Good alloca alignment 0", Align0, EXPECT_TRUE(Munger.runTest("Good alloca alignment 0", Align0,
...@@ -119,7 +119,7 @@ TEST(IceParseInstsTests, AllocaAlignment) { ...@@ -119,7 +119,7 @@ TEST(IceParseInstsTests, AllocaAlignment) {
// Show what happens when changing alignment to 2**30. // Show what happens when changing alignment to 2**30.
const uint64_t Align30[] = { const uint64_t Align30[] = {
ReplaceIndex, NaClBitcodeMunger::Replace, ReplaceIndex, NaClMungedBitcode::Replace,
3, naclbitc::FUNC_CODE_INST_ALLOCA, 1, getEncAlignPower(30), Terminator, 3, naclbitc::FUNC_CODE_INST_ALLOCA, 1, getEncAlignPower(30), Terminator,
}; };
EXPECT_FALSE(Munger.runTest("Bad alloca alignment 30", Align30, EXPECT_FALSE(Munger.runTest("Bad alloca alignment 30", Align30,
...@@ -137,7 +137,7 @@ TEST(IceParseInstsTests, AllocaAlignment) { ...@@ -137,7 +137,7 @@ TEST(IceParseInstsTests, AllocaAlignment) {
// Show what happens when changing alignment to 2**29. // Show what happens when changing alignment to 2**29.
const uint64_t Align29[] = { const uint64_t Align29[] = {
ReplaceIndex, NaClBitcodeMunger::Replace, ReplaceIndex, NaClMungedBitcode::Replace,
3, naclbitc::FUNC_CODE_INST_ALLOCA, 1, getEncAlignPower(29), Terminator, 3, naclbitc::FUNC_CODE_INST_ALLOCA, 1, getEncAlignPower(29), Terminator,
}; };
EXPECT_TRUE(Munger.runTest("Good alloca alignment 29", Align29, EXPECT_TRUE(Munger.runTest("Good alloca alignment 29", Align29,
...@@ -180,7 +180,7 @@ TEST(IceParseInstsTests, LoadI32Alignment) { ...@@ -180,7 +180,7 @@ TEST(IceParseInstsTests, LoadI32Alignment) {
// Show what happens when changing alignment to 0. // Show what happens when changing alignment to 0.
const uint64_t Align0[] = { const uint64_t Align0[] = {
ReplaceIndex, NaClBitcodeMunger::Replace, ReplaceIndex, NaClMungedBitcode::Replace,
3, naclbitc::FUNC_CODE_INST_LOAD, 1, getEncAlignZero(), 0, Terminator, 3, naclbitc::FUNC_CODE_INST_LOAD, 1, getEncAlignZero(), 0, Terminator,
}; };
EXPECT_FALSE(Munger.runTest("Bad load i32 alignment 0", Align0, EXPECT_FALSE(Munger.runTest("Bad load i32 alignment 0", Align0,
...@@ -195,7 +195,7 @@ TEST(IceParseInstsTests, LoadI32Alignment) { ...@@ -195,7 +195,7 @@ TEST(IceParseInstsTests, LoadI32Alignment) {
// Show what happens when changing alignment to 4. // Show what happens when changing alignment to 4.
const uint64_t Align4[] = { const uint64_t Align4[] = {
ReplaceIndex, NaClBitcodeMunger::Replace, ReplaceIndex, NaClMungedBitcode::Replace,
3, naclbitc::FUNC_CODE_INST_LOAD, 1, getEncAlignPower(2), 0, Terminator, 3, naclbitc::FUNC_CODE_INST_LOAD, 1, getEncAlignPower(2), 0, Terminator,
}; };
EXPECT_FALSE(Munger.runTest("Bad load i32 alignment 4", Align4, EXPECT_FALSE(Munger.runTest("Bad load i32 alignment 4", Align4,
...@@ -210,7 +210,7 @@ TEST(IceParseInstsTests, LoadI32Alignment) { ...@@ -210,7 +210,7 @@ TEST(IceParseInstsTests, LoadI32Alignment) {
// Show what happens when changing alignment to 2**29. // Show what happens when changing alignment to 2**29.
const uint64_t Align29[] = { const uint64_t Align29[] = {
ReplaceIndex, NaClBitcodeMunger::Replace, ReplaceIndex, NaClMungedBitcode::Replace,
3, naclbitc::FUNC_CODE_INST_LOAD, 1, getEncAlignPower(29), 0, Terminator, 3, naclbitc::FUNC_CODE_INST_LOAD, 1, getEncAlignPower(29), 0, Terminator,
}; };
EXPECT_FALSE(Munger.runTest("Bad load i32 alignment 29", Align29, EXPECT_FALSE(Munger.runTest("Bad load i32 alignment 29", Align29,
...@@ -225,7 +225,7 @@ TEST(IceParseInstsTests, LoadI32Alignment) { ...@@ -225,7 +225,7 @@ TEST(IceParseInstsTests, LoadI32Alignment) {
// Show what happens when changing alignment to 2**30. // Show what happens when changing alignment to 2**30.
const uint64_t Align30[] = { const uint64_t Align30[] = {
ReplaceIndex, NaClBitcodeMunger::Replace, ReplaceIndex, NaClMungedBitcode::Replace,
3, naclbitc::FUNC_CODE_INST_LOAD, 1, getEncAlignPower(30), 0, Terminator, 3, naclbitc::FUNC_CODE_INST_LOAD, 1, getEncAlignPower(30), 0, Terminator,
}; };
EXPECT_FALSE(Munger.runTest("Bad load i32 alignment 30", Align30, EXPECT_FALSE(Munger.runTest("Bad load i32 alignment 30", Align30,
...@@ -272,7 +272,7 @@ TEST(IceParseInstsTests, LoadFloatAlignment) { ...@@ -272,7 +272,7 @@ TEST(IceParseInstsTests, LoadFloatAlignment) {
// Show what happens when changing alignment to 0. // Show what happens when changing alignment to 0.
const uint64_t Align0[] = { const uint64_t Align0[] = {
ReplaceIndex, NaClBitcodeMunger::Replace, ReplaceIndex, NaClMungedBitcode::Replace,
3, naclbitc::FUNC_CODE_INST_LOAD, 1, getEncAlignZero(), 0, Terminator, 3, naclbitc::FUNC_CODE_INST_LOAD, 1, getEncAlignZero(), 0, Terminator,
}; };
EXPECT_FALSE(Munger.runTest("Bad load float alignment 0", Align0, EXPECT_FALSE(Munger.runTest("Bad load float alignment 0", Align0,
...@@ -288,7 +288,7 @@ TEST(IceParseInstsTests, LoadFloatAlignment) { ...@@ -288,7 +288,7 @@ TEST(IceParseInstsTests, LoadFloatAlignment) {
// Show what happens when changing alignment to 4. // Show what happens when changing alignment to 4.
const uint64_t Align4[] = { const uint64_t Align4[] = {
ReplaceIndex, NaClBitcodeMunger::Replace, ReplaceIndex, NaClMungedBitcode::Replace,
3, naclbitc::FUNC_CODE_INST_LOAD, 1, getEncAlignPower(2), 0, Terminator, 3, naclbitc::FUNC_CODE_INST_LOAD, 1, getEncAlignPower(2), 0, Terminator,
}; };
EXPECT_TRUE(Munger.runTest("Good load float alignment 4", Align4, EXPECT_TRUE(Munger.runTest("Good load float alignment 4", Align4,
...@@ -299,7 +299,7 @@ TEST(IceParseInstsTests, LoadFloatAlignment) { ...@@ -299,7 +299,7 @@ TEST(IceParseInstsTests, LoadFloatAlignment) {
DumpMunger.getLinesWithSubstring("load")); DumpMunger.getLinesWithSubstring("load"));
const uint64_t Align29[] = { const uint64_t Align29[] = {
ReplaceIndex, NaClBitcodeMunger::Replace, ReplaceIndex, NaClMungedBitcode::Replace,
3, naclbitc::FUNC_CODE_INST_LOAD, 1, getEncAlignPower(29), 0, Terminator, 3, naclbitc::FUNC_CODE_INST_LOAD, 1, getEncAlignPower(29), 0, Terminator,
}; };
EXPECT_FALSE(Munger.runTest("Bad load float alignment 29", Align29, EXPECT_FALSE(Munger.runTest("Bad load float alignment 29", Align29,
...@@ -315,7 +315,7 @@ TEST(IceParseInstsTests, LoadFloatAlignment) { ...@@ -315,7 +315,7 @@ TEST(IceParseInstsTests, LoadFloatAlignment) {
// Show what happens when changing alignment to 2**30. // Show what happens when changing alignment to 2**30.
const uint64_t Align30[] = { const uint64_t Align30[] = {
ReplaceIndex, NaClBitcodeMunger::Replace, ReplaceIndex, NaClMungedBitcode::Replace,
3, naclbitc::FUNC_CODE_INST_LOAD, 1, getEncAlignPower(30), 0, Terminator, 3, naclbitc::FUNC_CODE_INST_LOAD, 1, getEncAlignPower(30), 0, Terminator,
}; };
EXPECT_FALSE(Munger.runTest("Bad load float alignment 30", Align30, EXPECT_FALSE(Munger.runTest("Bad load float alignment 30", Align30,
...@@ -363,7 +363,7 @@ TEST(NaClParseInstsTests, StoreAlignment) { ...@@ -363,7 +363,7 @@ TEST(NaClParseInstsTests, StoreAlignment) {
// Show what happens when changing alignment to 0. // Show what happens when changing alignment to 0.
const uint64_t Align0[] = { const uint64_t Align0[] = {
ReplaceIndex, NaClBitcodeMunger::Replace, ReplaceIndex, NaClMungedBitcode::Replace,
3, naclbitc::FUNC_CODE_INST_STORE, 2, 1, getEncAlignZero(), Terminator, 3, naclbitc::FUNC_CODE_INST_STORE, 2, 1, getEncAlignZero(), Terminator,
}; };
EXPECT_FALSE( EXPECT_FALSE(
...@@ -379,7 +379,7 @@ TEST(NaClParseInstsTests, StoreAlignment) { ...@@ -379,7 +379,7 @@ TEST(NaClParseInstsTests, StoreAlignment) {
// Show what happens when changing alignment to 4. // Show what happens when changing alignment to 4.
const uint64_t Align4[] = { const uint64_t Align4[] = {
ReplaceIndex, NaClBitcodeMunger::Replace, ReplaceIndex, NaClMungedBitcode::Replace,
3, naclbitc::FUNC_CODE_INST_STORE, 2, 1, getEncAlignPower(2), Terminator, 3, naclbitc::FUNC_CODE_INST_STORE, 2, 1, getEncAlignPower(2), Terminator,
}; };
EXPECT_TRUE( EXPECT_TRUE(
...@@ -389,7 +389,7 @@ TEST(NaClParseInstsTests, StoreAlignment) { ...@@ -389,7 +389,7 @@ TEST(NaClParseInstsTests, StoreAlignment) {
// Show what happens when changing alignment to 8. // Show what happens when changing alignment to 8.
const uint64_t Align8[] = { const uint64_t Align8[] = {
ReplaceIndex, NaClBitcodeMunger::Replace, ReplaceIndex, NaClMungedBitcode::Replace,
3, naclbitc::FUNC_CODE_INST_STORE, 2, 1, getEncAlignPower(3), Terminator, 3, naclbitc::FUNC_CODE_INST_STORE, 2, 1, getEncAlignPower(3), Terminator,
}; };
EXPECT_FALSE( EXPECT_FALSE(
...@@ -405,7 +405,7 @@ TEST(NaClParseInstsTests, StoreAlignment) { ...@@ -405,7 +405,7 @@ TEST(NaClParseInstsTests, StoreAlignment) {
// Show what happens when changing alignment to 2**29. // Show what happens when changing alignment to 2**29.
const uint64_t Align29[] = { const uint64_t Align29[] = {
ReplaceIndex, NaClBitcodeMunger::Replace, ReplaceIndex, NaClMungedBitcode::Replace,
3, naclbitc::FUNC_CODE_INST_STORE, 2, 1, getEncAlignPower(29), Terminator, 3, naclbitc::FUNC_CODE_INST_STORE, 2, 1, getEncAlignPower(29), Terminator,
}; };
EXPECT_FALSE(Munger.runTest("Bad store alignment 29", Align29, EXPECT_FALSE(Munger.runTest("Bad store alignment 29", Align29,
...@@ -420,7 +420,7 @@ TEST(NaClParseInstsTests, StoreAlignment) { ...@@ -420,7 +420,7 @@ TEST(NaClParseInstsTests, StoreAlignment) {
DumpMunger.getLinesWithSubstring("store")); DumpMunger.getLinesWithSubstring("store"));
const uint64_t Align30[] = { const uint64_t Align30[] = {
ReplaceIndex, NaClBitcodeMunger::Replace, ReplaceIndex, NaClMungedBitcode::Replace,
// Note: alignment stored as 0 or log2(Alignment)+1. // Note: alignment stored as 0 or log2(Alignment)+1.
3, naclbitc::FUNC_CODE_INST_STORE, 2, 1, getEncAlignPower(30), Terminator, 3, naclbitc::FUNC_CODE_INST_STORE, 2, 1, getEncAlignPower(30), Terminator,
}; };
......
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