luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1176 from antmicro/bitstream-gen-fix 

bitstream_writer: fix 7 series and US+ headers
This commit is contained in:
Karol Gugala 2019-12-13 06:38:53 +01:00 committed by GitHub
parent cc9e00da8f 3acd1e99fc
commit b29742ba73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/xilinx/bitstream_writer.cc
View File

@ -16,7 +16,9 @@ typename BitstreamWriter<Spartan6>::header_t BitstreamWriter<Spartan6>::header_{
// Per UG470 pg 80: Bus Width Auto Detection
template <>
typename BitstreamWriter<Series7>::header_t BitstreamWriter<Series7>::header_{
0xFFFFFFFF, 0x000000BB, 0x11220044, 0xFFFFFFFF, 0xFFFFFFFF, 0xAA995566};
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x000000BB, 0x11220044,
0xFFFFFFFF, 0xFFFFFFFF, 0xAA995566};
template <>
typename BitstreamWriter<UltraScale>::header_t
@ -26,7 +28,10 @@ typename BitstreamWriter<UltraScale>::header_t
template <>
typename BitstreamWriter<UltraScalePlus>::header_t
BitstreamWriter<UltraScalePlus>::header_{
0xFFFFFFFF, 0x000000BB, 0x11220044, 0xFFFFFFFF, 0xFFFFFFFF, 0xAA995566};
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x000000BB, 0x11220044,
0xFFFFFFFF, 0xFFFFFFFF, 0xAA995566};
uint32_t packet2header(
const ConfigurationPacket<Spartan6ConfigurationRegister>& packet) {

40
lib/xilinx/tests/xc7series/bitstream_writer_test.cc
View File

@ -132,8 +132,10 @@ TEST(BitstreamWriterTest, WriteHeader) {
std::vector<uint32_t> words(writer.begin(), writer.end());
// Per UG470 pg 80: Bus Width Auto Detection
std::vector<uint32_t> ref_header{0xFFFFFFFF, 0x000000BB, 0x11220044,
0xFFFFFFFF, 0xFFFFFFFF, 0xAA995566};
std::vector<uint32_t> ref_header{
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x000000BB, 0x11220044,
0xFFFFFFFF, 0xFFFFFFFF, 0xAA995566};
EXPECT_EQ(words, ref_header);
// dump_packets(writer);
@ -146,11 +148,13 @@ TEST(BitstreamWriterTest, WriteType0) {
BitstreamWriter<Series7> writer(packets);
// dump_packets(writer, false);
std::vector<uint32_t> words(writer.begin(), writer.end());
std::vector<uint32_t> ref{// Bus width + sync
0x0FFFFFFFF, 0x0000000BB, 0x011220044,
0x0FFFFFFFF, 0x0FFFFFFFF, 0x0AA995566,
// Type 0
0x00000000};
std::vector<uint32_t> ref{
// Bus width + sync
0x0FFFFFFFF, 0x0FFFFFFFF, 0x0FFFFFFFF, 0x0FFFFFFFF, 0x0FFFFFFFF,
0x0FFFFFFFF, 0x0FFFFFFFF, 0x0FFFFFFFF, 0x0000000BB, 0x011220044,
0x0FFFFFFFF, 0x0FFFFFFFF, 0x0AA995566,
// Type 0
0x00000000};
EXPECT_EQ(words, ref);
}
TEST(BitstreamWriterTest, WriteType1) {
@ -160,11 +164,13 @@ TEST(BitstreamWriterTest, WriteType1) {
BitstreamWriter<Series7> writer(packets);
// dump_packets(writer, false);
std::vector<uint32_t> words(writer.begin(), writer.end());
std::vector<uint32_t> ref{// Bus width + sync
0x0FFFFFFFF, 0x0000000BB, 0x011220044,
0x0FFFFFFFF, 0x0FFFFFFFF, 0x0AA995566,
// Type 1
0x030006002, 0x0000000AA, 0x0000000BB};
std::vector<uint32_t> ref{
// Bus width + sync
0x0FFFFFFFF, 0x0FFFFFFFF, 0x0FFFFFFFF, 0x0FFFFFFFF, 0x0FFFFFFFF,
0x0FFFFFFFF, 0x0FFFFFFFF, 0x0FFFFFFFF, 0x0000000BB, 0x011220044,
0x0FFFFFFFF, 0x0FFFFFFFF, 0x0AA995566,
// Type 1
0x030006002, 0x0000000AA, 0x0000000BB};
EXPECT_EQ(words, ref);
}
@ -177,8 +183,9 @@ TEST(BitstreamWriterTest, WriteType2) {
std::vector<uint32_t> words(writer.begin(), writer.end());
std::vector<uint32_t> ref{
// Bus width + sync
0x0FFFFFFFF, 0x0000000BB, 0x011220044, 0x0FFFFFFFF, 0x0FFFFFFFF,
0x0AA995566,
0x0FFFFFFFF, 0x0FFFFFFFF, 0x0FFFFFFFF, 0x0FFFFFFFF, 0x0FFFFFFFF,
0x0FFFFFFFF, 0x0FFFFFFFF, 0x0FFFFFFFF, 0x0000000BB, 0x011220044,
0x0FFFFFFFF, 0x0FFFFFFFF, 0x0AA995566,
// Type 1 + type 2 header
0x030006000, 0x04800000C, 0x000000001, 0x000000002, 0x000000003,
0x000000004, 0x000000005, 0x000000006, 0x000000007, 0x000000008,
@ -198,8 +205,9 @@ TEST(BitstreamWriterTest, WriteMulti) {
std::vector<uint32_t> words(writer.begin(), writer.end());
std::vector<uint32_t> ref{
// Bus width + sync
0x0FFFFFFFF, 0x0000000BB, 0x011220044, 0x0FFFFFFFF, 0x0FFFFFFFF,
0x0AA995566,
0x0FFFFFFFF, 0x0FFFFFFFF, 0x0FFFFFFFF, 0x0FFFFFFFF, 0x0FFFFFFFF,
0x0FFFFFFFF, 0x0FFFFFFFF, 0x0FFFFFFFF, 0x0000000BB, 0x011220044,
0x0FFFFFFFF, 0x0FFFFFFFF, 0x0AA995566,
// Type1
0x030006002, 0x0000000AA, 0x0000000BB,
// Type1