caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests pass now

Browse Source
This commit is contained in:
Miodrag Milanovic 2018-06-23 14:56:30 +02:00
parent 82ec1be31f
commit c8e7249440
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/ice40/hx1k.cc
View File

@ -9,6 +9,7 @@ class HX1KTest : public ::testing::Test
protected: protected:
virtual void SetUp() virtual void SetUp()
{ {
IdString::global_ctx = nullptr;
chipArgs.type = ArchArgs::HX1K; chipArgs.type = ArchArgs::HX1K;
chipArgs.package = "tq144"; chipArgs.package = "tq144";
ctx = new Context(chipArgs); ctx = new Context(chipArgs);
@ -28,7 +29,7 @@ TEST_F(HX1KTest, bel_names)
ASSERT_EQ(bel, ctx->getBelByName(name)); ASSERT_EQ(bel, ctx->getBelByName(name));
bel_count++; bel_count++;
} }
ASSERT_EQ(bel_count, 1416); ASSERT_EQ(bel_count, 1418);
} }
TEST_F(HX1KTest, wire_names) TEST_F(HX1KTest, wire_names)

3
tests/ice40/hx8k.cc
View File

@ -9,6 +9,7 @@ class HX8KTest : public ::testing::Test
protected: protected:
virtual void SetUp() virtual void SetUp()
{ {
IdString::global_ctx = nullptr;
chipArgs.type = ArchArgs::HX8K; chipArgs.type = ArchArgs::HX8K;
chipArgs.package = "ct256"; chipArgs.package = "ct256";
ctx = new Context(chipArgs); ctx = new Context(chipArgs);
@ -28,7 +29,7 @@ TEST_F(HX8KTest, bel_names)
ASSERT_EQ(bel, ctx->getBelByName(name)); ASSERT_EQ(bel, ctx->getBelByName(name));
bel_count++; bel_count++;
} }
ASSERT_EQ(bel_count, 7968); ASSERT_EQ(bel_count, 7979);
} }
TEST_F(HX8KTest, wire_names) TEST_F(HX8KTest, wire_names)

3
tests/ice40/lp1k.cc
View File

@ -9,6 +9,7 @@ class LP1KTest : public ::testing::Test
protected: protected:
virtual void SetUp() virtual void SetUp()
{ {
IdString::global_ctx = nullptr;
chipArgs.type = ArchArgs::LP1K; chipArgs.type = ArchArgs::LP1K;
chipArgs.package = "tq144"; chipArgs.package = "tq144";
ctx = new Context(chipArgs); ctx = new Context(chipArgs);
@ -28,7 +29,7 @@ TEST_F(LP1KTest, bel_names)
ASSERT_EQ(bel, ctx->getBelByName(name)); ASSERT_EQ(bel, ctx->getBelByName(name));
bel_count++; bel_count++;
} }
ASSERT_EQ(bel_count, 1416); ASSERT_EQ(bel_count, 1418);
} }
TEST_F(LP1KTest, wire_names) TEST_F(LP1KTest, wire_names)

3
tests/ice40/lp384.cc
View File

@ -9,6 +9,7 @@ class LP384Test : public ::testing::Test
protected: protected:
virtual void SetUp() virtual void SetUp()
{ {
IdString::global_ctx = nullptr;
chipArgs.type = ArchArgs::LP384; chipArgs.type = ArchArgs::LP384;
chipArgs.package = "qn32"; chipArgs.package = "qn32";
ctx = new Context(chipArgs); ctx = new Context(chipArgs);
@ -28,7 +29,7 @@ TEST_F(LP384Test, bel_names)
ASSERT_EQ(bel, ctx->getBelByName(name)); ASSERT_EQ(bel, ctx->getBelByName(name));
bel_count++; bel_count++;
} }
ASSERT_EQ(bel_count, 440); ASSERT_EQ(bel_count, 449);
} }
TEST_F(LP384Test, wire_names) TEST_F(LP384Test, wire_names)

3
tests/ice40/lp8k.cc
View File

@ -9,6 +9,7 @@ class LP8KTest : public ::testing::Test
protected: protected:
virtual void SetUp() virtual void SetUp()
{ {
IdString::global_ctx = nullptr;
chipArgs.type = ArchArgs::LP8K; chipArgs.type = ArchArgs::LP8K;
chipArgs.package = "ct256"; chipArgs.package = "ct256";
ctx = new Context(chipArgs); ctx = new Context(chipArgs);
@ -28,7 +29,7 @@ TEST_F(LP8KTest, bel_names)
ASSERT_EQ(bel, ctx->getBelByName(name)); ASSERT_EQ(bel, ctx->getBelByName(name));
bel_count++; bel_count++;
} }
ASSERT_EQ(bel_count, 7968); ASSERT_EQ(bel_count, 7979);
} }
TEST_F(LP8KTest, wire_names) TEST_F(LP8KTest, wire_names)

3
tests/ice40/up5k.cc
View File

@ -9,6 +9,7 @@ class UP5KTest : public ::testing::Test
protected: protected:
virtual void SetUp() virtual void SetUp()
{ {
IdString::global_ctx = nullptr;
chipArgs.type = ArchArgs::UP5K; chipArgs.type = ArchArgs::UP5K;
chipArgs.package = "sg48"; chipArgs.package = "sg48";
ctx = new Context(chipArgs); ctx = new Context(chipArgs);
@ -28,7 +29,7 @@ TEST_F(UP5KTest, bel_names)
ASSERT_EQ(bel, ctx->getBelByName(name)); ASSERT_EQ(bel, ctx->getBelByName(name));
bel_count++; bel_count++;
} }
ASSERT_EQ(bel_count, 5414); ASSERT_EQ(bel_count, 5438);
} }
TEST_F(UP5KTest, wire_names) TEST_F(UP5KTest, wire_names)