", file=f)
- for grid_y in range(grid_range[1], grid_range[3]+1):
+ for grid_y in range(grid_range[1], grid_range[3] + 1):
print("", file=f)
- for grid_x in range(grid_range[0], grid_range[2]+1):
+ for grid_x in range(grid_range[0], grid_range[2] + 1):
tilename = grid_map[(grid_x, grid_y)]
tiledata = grid["tiles"][tilename]
segdata = None
bgcolor = "#aaaaaa"
- if tiledata["type"] in ["INT_L", "INT_R"]: bgcolor="#aaaaff"
- if tiledata["type"] in ["CLBLL_L", "CLBLL_R"]: bgcolor="#ffffaa"
- if tiledata["type"] in ["CLBLM_L", "CLBLM_R"]: bgcolor="#ffaaaa"
- if tiledata["type"] in ["HCLK_L", "HCLK_R"]: bgcolor="#aaffaa"
+ if tiledata["type"] in ["INT_L", "INT_R"]:
+ bgcolor = "#aaaaff"
+ if tiledata["type"] in ["CLBLL_L", "CLBLL_R"]:
+ bgcolor = "#ffffaa"
+ if tiledata["type"] in ["CLBLM_L", "CLBLM_R"]:
+ bgcolor = "#ffaaaa"
+ if tiledata["type"] in ["HCLK_L", "HCLK_R"]:
+ bgcolor = "#aaffaa"
- if tiledata["type"] in ["BRAM_INT_INTERFACE_L", "BRAM_L"]: bgcolor="#aaffff"
- if tiledata["type"] in ["BRAM_INT_INTERFACE_R", "BRAM_R"]: bgcolor="#aaffff"
+ if tiledata["type"] in ["BRAM_INT_INTERFACE_L", "BRAM_L"]:
+ bgcolor = "#aaffff"
+ if tiledata["type"] in ["BRAM_INT_INTERFACE_R", "BRAM_R"]:
+ bgcolor = "#aaffff"
- if tiledata["type"] in ["INT_INTERFACE_L", "DSP_L"]: bgcolor="#ffaaff"
- if tiledata["type"] in ["INT_INTERFACE_R", "DSP_R"]: bgcolor="#ffaaff"
+ if tiledata["type"] in ["INT_INTERFACE_L", "DSP_L"]:
+ bgcolor = "#ffaaff"
+ if tiledata["type"] in ["INT_INTERFACE_R", "DSP_R"]:
+ bgcolor = "#ffaaff"
title = [tilename]
@@ -282,21 +302,25 @@ with out_open("index.html") as f:
if "segment" in tiledata:
if "baseaddr" in segdata:
- title.append("Baseaddr: %s %d" % tuple(segdata["baseaddr"]))
+ title.append("Baseaddr: %s %d" %
+ tuple(segdata["baseaddr"]))
else:
- print("Warning: no baseaddr in segment %s (via tile %s)." % (tiledata["segment"], tilename))
+ print("Warning: no baseaddr in segment %s (via tile %s)." %
+ (tiledata["segment"], tilename))
tilename = tilename.replace("INT_INTERFACE_", "INTF_")
tilename = tilename.replace("_X", "
X")
tilename = tilename.replace("B_TERM", "B
TERM")
- print("" % (bgcolor, "\n".join(title)), file=f)
+ print(" | " %
+ (bgcolor, "\n".join(title)), file=f)
if "segment" in tiledata:
segtype = segdata["type"].lower()
print("%s | " %
- (segtype, tilename.replace("_X", "
X")), file=f)
+ (segtype, tilename.replace("_X", "
X")), file=f)
else:
- print("%s" % tilename.replace("_X", "
X").replace("B_TERM", "B
TERM"), file=f)
+ print("%s" % tilename.replace("_X",
+ "
X").replace("B_TERM", "B
TERM"), file=f)
print("
", file=f)
@@ -309,12 +333,14 @@ with out_open("index.html") as f:
for segtype in sorted(segbits.keys()):
with out_open("seg_%s.html" % segtype) as f:
- print("X-Ray %s Database: %s" % (get_setting("XRAY_DATABASE").upper(), segtype.upper()), file=f)
+ print("X-Ray %s Database: %s" %
+ (get_setting("XRAY_DATABASE").upper(), segtype.upper()), file=f)
if segtype in ["hclk_l", "hclk_r"]:
- print("X-Ray %s Database: %s Segment
" % (get_setting("XRAY_DATABASE").upper(), segtype.upper()), file=f)
+ print("X-Ray %s Database: %s Segment
" %
+ (get_setting("XRAY_DATABASE").upper(), segtype.upper()), file=f)
else:
print("X-Ray %s Database: %s Segment (%s Tile + %s Tile)
" % (get_setting("XRAY_DATABASE").upper(), segtype.upper(),
- segtype.upper(), re.sub("clbl[lm]|bram[0-4]|dsp[0-4]", "int", segtype).upper()), file=f)
+ segtype.upper(), re.sub("clbl[lm]|bram[0-4]|dsp[0-4]", "int", segtype).upper()), file=f)
print("""
", file=f)
@@ -682,8 +714,10 @@ function oml() {
line = " -->%s | " % (pip)
for bit in grp_bits:
c = "-"
- if bit in routebits[segtype] and pip in routebits[segtype][bit]: c = "1"
- if bit in routezbits[segtype] and pip in routezbits[segtype][bit]: c = "0"
+ if bit in routebits[segtype] and pip in routebits[segtype][bit]:
+ c = "1"
+ if bit in routezbits[segtype] and pip in routezbits[segtype][bit]:
+ c = "0"
line = "%s%s%s | " % (c, line, c)
lines.append(line)
@@ -699,8 +733,10 @@ function oml() {
if len(shared_bits[bit]) > 1:
if first_note:
print("Note(s):
", file=f)
- print("Warning: Groups sharing bit %s: %s." % (bit, ", ".join(sorted(shared_bits[bit]))))
- print("Groups sharing bit %s: %s.
" % (bit, ", ".join(sorted(shared_bits[bit]))), file=f)
+ print("Warning: Groups sharing bit %s: %s." %
+ (bit, ", ".join(sorted(shared_bits[bit]))))
+ print("Groups sharing bit %s: %s.
" %
+ (bit, ", ".join(sorted(shared_bits[bit]))), file=f)
first_note = False
if not first_note:
print("
", file=f)
@@ -708,13 +744,15 @@ function oml() {
for tile_type in segtiles[segtype]:
print("Tile %s Pseudo PIPs
" % tile_type, file=f)
print("", file=f)
- print("| PIP | Type |
|---|
", file=f)
+ print(
+ "| PIP | Type |
|---|
", file=f)
trstyle = ""
with db_open("ppips_%s.db" % tile_type.lower()) as fi:
for line in fi:
pip_name, pip_type = line.split()
trstyle = " bgcolor=\"#dddddd\"" if trstyle == "" else ""
- print("%s | %s | " % (trstyle, pip_name, pip_type), file=f)
+ print("%s | %s | " %
+ (trstyle, pip_name, pip_type), file=f)
print("
", file=f)
print("", file=f)
diff --git a/lib/bit_ops_test.cc b/lib/bit_ops_test.cc
index 67f33eb8..18377785 100644
--- a/lib/bit_ops_test.cc
+++ b/lib/bit_ops_test.cc
@@ -44,28 +44,24 @@ TEST(BitFieldGetTest, SelectMidway) {
TEST(BitFieldSetTest, WriteOneBit) {
uint32_t actual = prjxray::bit_field_set(
- static_cast(0x0), 23, 23,
- static_cast(0x1));
+ static_cast(0x0), 23, 23, static_cast(0x1));
EXPECT_EQ(actual, static_cast(0x800000));
}
TEST(BitFieldSetTest, WriteOneBitWithOutOfRangeValue) {
uint32_t actual = prjxray::bit_field_set(
- static_cast(0x0), 23, 23,
- static_cast(0x3));
+ static_cast(0x0), 23, 23, static_cast(0x3));
EXPECT_EQ(actual, static_cast(0x800000));
}
TEST(BitFieldSetTest, WriteMultipleBits) {
uint32_t actual = prjxray::bit_field_set(
- static_cast(0x0), 18, 8,
- static_cast(0x123));
+ static_cast(0x0), 18, 8, static_cast(0x123));
EXPECT_EQ(actual, static_cast(0x12300));
}
TEST(BitFieldSetTest, WriteMultipleBitsWithOutOfRangeValue) {
uint32_t actual = prjxray::bit_field_set(
- static_cast(0x0), 18, 8,
- static_cast(0x1234));
+ static_cast(0x0), 18, 8, static_cast(0x1234));
EXPECT_EQ(actual, static_cast(0x23400));
}
diff --git a/lib/database.cc b/lib/database.cc
index f0f3eade..6fac62db 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -10,20 +10,20 @@ namespace prjxray {
static constexpr const char kSegbitsGlobPattern[] = "segbits_*.db";
-std::vector> Database::segbits() const {
+std::vector> Database::segbits()
+ const {
std::vector> segbits;
glob_t segbits_glob_results;
int ret = glob(absl::StrCat(db_path_, "/", kSegbitsGlobPattern).c_str(),
- GLOB_NOSORT | GLOB_TILDE,
- NULL, &segbits_glob_results);
+ GLOB_NOSORT | GLOB_TILDE, NULL, &segbits_glob_results);
if (ret < 0) {
return {};
}
- for(size_t idx = 0; idx < segbits_glob_results.gl_pathc; idx++) {
+ for (size_t idx = 0; idx < segbits_glob_results.gl_pathc; idx++) {
auto this_segbit = SegbitsFileReader::InitWithFile(
- segbits_glob_results.gl_pathv[idx]);
+ segbits_glob_results.gl_pathv[idx]);
if (this_segbit) {
segbits.emplace_back(std::move(this_segbit));
}
diff --git a/lib/include/prjxray/big_endian_span.h b/lib/include/prjxray/big_endian_span.h
index 944c52b1..683f9c3f 100644
--- a/lib/include/prjxray/big_endian_span.h
+++ b/lib/include/prjxray/big_endian_span.h
@@ -8,9 +8,9 @@
namespace prjxray {
-template
+template
class BigEndianSpan {
- public:
+ public:
constexpr static size_t kBytesPerElement = sizeof(WordType);
using byte_type = ByteType;
@@ -18,43 +18,45 @@ class BigEndianSpan {
using size_type = std::size_t;
class value_type {
- public:
+ public:
operator WordType() const {
WordType word = 0;
- for(size_t ii = 0; ii < kBytesPerElement; ++ii) {
- word |= (static_cast(bytes_[ii]) << ((kBytesPerElement - 1 - ii) * 8));
+ for (size_t ii = 0; ii < kBytesPerElement; ++ii) {
+ word |= (static_cast(bytes_[ii])
+ << ((kBytesPerElement - 1 - ii) * 8));
}
return word;
}
value_type& operator=(WordType word) {
for (size_t ii = 0; ii < kBytesPerElement; ++ii) {
- bytes_[ii] = ((word >> ((kBytesPerElement - 1 - ii) * 8)) & 0xFF);
+ bytes_[ii] =
+ ((word >>
+ ((kBytesPerElement - 1 - ii) * 8)) &
+ 0xFF);
}
return *this;
}
- protected:
+ protected:
friend class BigEndianSpan;
- value_type(absl::Span bytes) : bytes_(bytes) {};
+ value_type(absl::Span bytes) : bytes_(bytes){};
- private:
+ private:
absl::Span bytes_;
};
class iterator
- : public std::iterator {
- public:
- value_type operator*() const {
- return value_type(bytes_);
- }
+ : public std::iterator {
+ public:
+ value_type operator*() const { return value_type(bytes_); }
- bool operator==(const iterator &other) const {
+ bool operator==(const iterator& other) const {
return bytes_ == other.bytes_;
}
- bool operator!=(const iterator &other) const {
+ bool operator!=(const iterator& other) const {
return bytes_ != other.bytes_;
}
@@ -63,20 +65,19 @@ class BigEndianSpan {
return *this;
}
- protected:
+ protected:
friend class BigEndianSpan;
- iterator(absl::Span bytes) : bytes_(bytes) {};
+ iterator(absl::Span bytes) : bytes_(bytes){};
- private:
+ private:
absl::Span bytes_;
};
-
using pointer = value_type*;
using reference = value_type&;
- BigEndianSpan(absl::Span bytes) : bytes_(bytes) {};
+ BigEndianSpan(absl::Span bytes) : bytes_(bytes){};
constexpr size_type size() const noexcept {
return bytes_.size() / kBytesPerElement;
@@ -88,7 +89,7 @@ class BigEndianSpan {
value_type operator[](size_type pos) const {
assert(pos >= 0 && pos < size());
- return value_type(bytes_.subspan((pos*kBytesPerElement)));
+ return value_type(bytes_.subspan((pos * kBytesPerElement)));
}
constexpr reference at(size_type pos) const {
@@ -98,16 +99,15 @@ class BigEndianSpan {
iterator begin() const { return iterator(bytes_); }
iterator end() const { return iterator({}); }
- private:
-
+ private:
absl::Span bytes_;
};
-template
+template
BigEndianSpan make_big_endian_span(
- Container &bytes) {
+ Container& bytes) {
return BigEndianSpan(
- absl::Span(bytes));
+ absl::Span(bytes));
}
} // namespace prjxray
diff --git a/lib/include/prjxray/bit_ops.h b/lib/include/prjxray/bit_ops.h
index baeaab1c..c7d3fa8b 100644
--- a/lib/include/prjxray/bit_ops.h
+++ b/lib/include/prjxray/bit_ops.h
@@ -3,41 +3,44 @@
namespace prjxray {
-template
+template
constexpr UInt bit_mask(const int bit) {
return (static_cast(1) << bit);
}
-template
+template
constexpr UInt bit_sizeof() {
return sizeof(UInt) * 8;
}
-template
+template
constexpr UInt bit_all_ones() {
return ~static_cast(0);
}
-template
+template
constexpr UInt bit_mask_range(const int top_bit, const int bottom_bit) {
return ((bit_all_ones() >> (bit_sizeof() - 1 - top_bit)) &
- (bit_all_ones() - bit_mask(bottom_bit) +
- static_cast(1)));
+ (bit_all_ones() - bit_mask(bottom_bit) +
+ static_cast(1)));
}
-
-template
-constexpr UInt bit_field_get(UInt value, const int top_bit, const int bottom_bit) {
- return (value & bit_mask_range(top_bit, bottom_bit)) >> bottom_bit;
+template
+constexpr UInt bit_field_get(UInt value,
+ const int top_bit,
+ const int bottom_bit) {
+ return (value & bit_mask_range(top_bit, bottom_bit)) >>
+ bottom_bit;
}
-template
+template
constexpr UInt bit_field_set(const UInt reg_value,
- const int top_bit, const int bottom_bit,
- const ValueType field_value) {
+ const int top_bit,
+ const int bottom_bit,
+ const ValueType field_value) {
return ((reg_value & ~bit_mask_range(top_bit, bottom_bit)) |
- ((static_cast(field_value) << bottom_bit) &
- bit_mask_range(top_bit, bottom_bit)));
+ ((static_cast(field_value) << bottom_bit) &
+ bit_mask_range(top_bit, bottom_bit)));
}
} // namespace prjxray
diff --git a/lib/include/prjxray/database.h b/lib/include/prjxray/database.h
index 15b587d5..76b10935 100644
--- a/lib/include/prjxray/database.h
+++ b/lib/include/prjxray/database.h
@@ -10,16 +10,15 @@
namespace prjxray {
class Database {
- public:
- Database(const std::string &path)
- : db_path_(path) {}
+ public:
+ Database(const std::string& path) : db_path_(path) {}
std::vector> segbits() const;
- private:
+ private:
std::string db_path_;
};
} // namespace prjxray
-#endif // PRJXRAY_LIB_DATABASE_H
+#endif // PRJXRAY_LIB_DATABASE_H
diff --git a/lib/include/prjxray/memory_mapped_file.h b/lib/include/prjxray/memory_mapped_file.h
index c2fd955d..9a944b70 100644
--- a/lib/include/prjxray/memory_mapped_file.h
+++ b/lib/include/prjxray/memory_mapped_file.h
@@ -9,11 +9,11 @@
namespace prjxray {
class MemoryMappedFile {
- public:
+ public:
~MemoryMappedFile();
static std::unique_ptr InitWithFile(
- const std::string &path);
+ const std::string& path);
void* const data() const { return data_; }
const size_t size() const { return size_; }
@@ -22,14 +22,13 @@ class MemoryMappedFile {
return {static_cast(data_), size_};
}
- private:
- MemoryMappedFile(void *data, size_t size)
- : data_(data), size_(size) {};
+ private:
+ MemoryMappedFile(void* data, size_t size) : data_(data), size_(size){};
- void *data_;
+ void* data_;
size_t size_;
};
-} // namespace prjxray
+} // namespace prjxray
#endif // PRJXRAY_LIB_MEMORY_MAPPED_FILE
diff --git a/lib/include/prjxray/segbits_file_reader.h b/lib/include/prjxray/segbits_file_reader.h
index 277eba1c..19c4f51a 100644
--- a/lib/include/prjxray/segbits_file_reader.h
+++ b/lib/include/prjxray/segbits_file_reader.h
@@ -10,39 +10,41 @@
namespace prjxray {
class SegbitsFileReader {
- public:
+ public:
class value_type {
- public:
+ public:
absl::string_view tag() const { return tag_; }
absl::string_view bit() const { return bit_; }
- private:
+ private:
friend SegbitsFileReader;
- value_type(const absl::string_view &view);
+ value_type(const absl::string_view& view);
absl::string_view tag_;
absl::string_view bit_;
};
class iterator
- : public std::iterator {
- public:
+ : public std::iterator {
+ public:
iterator& operator++();
bool operator==(iterator other) const {
- return view_ == other.view_; }
+ return view_ == other.view_;
+ }
bool operator!=(iterator other) const {
- return !(*this == other);}
+ return !(*this == other);
+ }
const value_type& operator*() const { return value_; }
const value_type* operator->() const { return &value_; }
- protected:
+ protected:
explicit iterator(absl::string_view view)
- : view_(view), value_(view) {}
+ : view_(view), value_(view) {}
- private:
+ private:
friend SegbitsFileReader;
absl::string_view view_;
@@ -50,18 +52,18 @@ class SegbitsFileReader {
};
static std::unique_ptr InitWithFile(
- const std::string &path);
+ const std::string& path);
iterator begin();
iterator end();
- private:
- SegbitsFileReader(std::unique_ptr &&mapped_file)
- : mapped_file_(std::move(mapped_file)) {};
+ private:
+ SegbitsFileReader(std::unique_ptr&& mapped_file)
+ : mapped_file_(std::move(mapped_file)){};
std::unique_ptr mapped_file_;
};
-} // namespace prjxray
+} // namespace prjxray
#endif // PRJXRAY_LIB_SEGBITS_FILE_READER_H
diff --git a/lib/include/prjxray/xilinx/xc7series/bitstream_reader.h b/lib/include/prjxray/xilinx/xc7series/bitstream_reader.h
index fad41bde..5cfca36d 100644
--- a/lib/include/prjxray/xilinx/xc7series/bitstream_reader.h
+++ b/lib/include/prjxray/xilinx/xc7series/bitstream_reader.h
@@ -16,24 +16,24 @@ namespace xilinx {
namespace xc7series {
class BitstreamReader {
- public:
+ public:
using value_type = ConfigurationPacket;
class iterator
- : public std::iterator {
- public:
+ : public std::iterator {
+ public:
iterator& operator++();
- bool operator==(const iterator &other) const;
- bool operator!=(const iterator &other) const;
+ bool operator==(const iterator& other) const;
+ bool operator!=(const iterator& other) const;
const value_type& operator*() const;
const value_type* operator->() const;
- protected:
+ protected:
explicit iterator(absl::Span words);
- private:
+ private:
friend BitstreamReader;
ConfigurationPacket::ParseResult parse_result_;
@@ -42,31 +42,32 @@ class BitstreamReader {
// Construct a reader from a collection of 32-bit, big-endian words.
// Assumes that any sync word has already been removed.
- BitstreamReader(std::vector &&words);
+ BitstreamReader(std::vector&& words);
// Construct a `BitstreamReader` from a Container of bytes.
// Any bytes preceding an initial sync word are ignored.
- template
+ template
static absl::optional InitWithBytes(T bitstream);
- const std::vector &words() { return words_; };
+ const std::vector& words() { return words_; };
// Returns an iterator that yields `ConfigurationPackets`
// as read from the bitstream.
iterator begin();
iterator end();
- private:
+
+ private:
static std::array kSyncWord;
std::vector words_;
};
-template
+template
absl::optional BitstreamReader::InitWithBytes(T bitstream) {
// If this is really a Xilinx 7-Series bitstream, there will be a sync
// word somewhere toward the beginning.
auto sync_pos = std::search(bitstream.begin(), bitstream.end(),
- kSyncWord.begin(), kSyncWord.end());
+ kSyncWord.begin(), kSyncWord.end());
if (sync_pos == bitstream.end()) {
return absl::optional();
}
@@ -74,13 +75,13 @@ absl::optional BitstreamReader::InitWithBytes(T bitstream) {
// Wrap the provided container in a span that strips off the preamble.
absl::Span bitstream_span(bitstream);
- auto config_packets = bitstream_span.subspan(
- sync_pos - bitstream.begin());
+ auto config_packets =
+ bitstream_span.subspan(sync_pos - bitstream.begin());
// Convert the bytes into 32-bit, big-endian words.
auto big_endian_reader = make_big_endian_span(config_packets);
std::vector words{big_endian_reader.begin(),
- big_endian_reader.end()};
+ big_endian_reader.end()};
return BitstreamReader(std::move(words));
}
diff --git a/lib/include/prjxray/xilinx/xc7series/block_type.h b/lib/include/prjxray/xilinx/xc7series/block_type.h
index f2e0ecef..400a19fc 100644
--- a/lib/include/prjxray/xilinx/xc7series/block_type.h
+++ b/lib/include/prjxray/xilinx/xc7series/block_type.h
@@ -16,18 +16,18 @@ enum class BlockType : unsigned int {
/* reserved = 0x3, */
};
-std::ostream &operator<<(std::ostream &o, BlockType value);
+std::ostream& operator<<(std::ostream& o, BlockType value);
} // namespace xc7series
} // namespace xilinx
} // namespace prjxray
namespace YAML {
-template<>
+template <>
struct convert {
- static Node encode(const prjxray::xilinx::xc7series::BlockType &rhs);
+ static Node encode(const prjxray::xilinx::xc7series::BlockType& rhs);
static bool decode(const Node& node,
- prjxray::xilinx::xc7series::BlockType &lhs);
+ prjxray::xilinx::xc7series::BlockType& lhs);
};
} // namespace YAML
diff --git a/lib/include/prjxray/xilinx/xc7series/configuration.h b/lib/include/prjxray/xilinx/xc7series/configuration.h
index 7fa643ab..6e1dfbc9 100644
--- a/lib/include/prjxray/xilinx/xc7series/configuration.h
+++ b/lib/include/prjxray/xilinx/xc7series/configuration.h
@@ -14,30 +14,31 @@ namespace xilinx {
namespace xc7series {
class Configuration {
- public:
- using FrameMap = std::map>;
+ public:
+ using FrameMap = std::map>;
- template
+ template
static absl::optional InitWithPackets(
- const Part& part, Collection &packets);
+ const Part& part,
+ Collection& packets);
- Configuration(const Part& part, const FrameMap &frames)
- : part_(part), frames_(std::move(frames)) {}
+ Configuration(const Part& part, const FrameMap& frames)
+ : part_(part), frames_(std::move(frames)) {}
const Part& part() const { return part_; }
const FrameMap& frames() const { return frames_; }
- private:
+ private:
static constexpr int kWordsPerFrame = 101;
Part part_;
FrameMap frames_;
};
-template
+template
absl::optional Configuration::InitWithPackets(
- const Part& part, Collection &packets) {
+ const Part& part,
+ Collection& packets) {
// Registers that can be directly written to.
uint32_t command_register = 0;
uint32_t frame_address_register = 0;
@@ -55,95 +56,106 @@ absl::optional Configuration::InitWithPackets(
}
switch (packet.address()) {
- case ConfigurationRegister::MASK:
- if (packet.data().size() < 1) continue;
- mask_register = packet.data()[0];
- break;
- case ConfigurationRegister::CTL1:
- if (packet.data().size() < 1) continue;
- ctl1_register = packet.data()[0] & mask_register;
- break;
- case ConfigurationRegister::CMD:
- if (packet.data().size() < 1) continue;
- command_register = packet.data()[0];
- // Writes to CMD trigger an immediate action. In the case of
- // WCFG, that is just setting a flag for the next FDIR.
- if (command_register == 0x1) {
- start_new_write = true;
- }
- break;
- case ConfigurationRegister::IDCODE:
- // This really should be a one-word write.
- if (packet.data().size() < 1) continue;
-
- // If the IDCODE doesn't match our expected part,
- // consider the bitstream invalid.
- if (packet.data()[0] != part.idcode()) {
- return {};
- }
- break;
- case ConfigurationRegister::FAR:
- // This really should be a one-word write.
- if (packet.data().size() < 1) continue;
- frame_address_register = packet.data()[0];
-
- // Per UG470, the command present in the CMD register
- // is executed each time the FAR register is laoded
- // with a new value. As we only care about WCFG
- // commands, just check that here. CTRL1 is completely
- // undocumented but looking at generated bitstreams, bit 21
- // is used when per-frame CRC is enabled. Setting this
- // bit seems to inhibit the re-execution of CMD during a
- // FAR write. In practice, this is used so FAR writes
- // can be added in the bitstream to show progress
- // markers without impacting the actual write
- // operation.
- if (bit_field_get(ctl1_register, 21, 21) == 0 &&
- command_register == 0x1) {
- start_new_write = true;
- }
- break;
- case ConfigurationRegister::FDRI: {
- if (start_new_write) {
- current_frame_address = frame_address_register;
- start_new_write = false;
- }
-
- // 7-series frames are 101-words long. Writes to this
- // register can be multiples of that to do
- // auto-incrementing block writes.
- for (size_t ii = 0;
- ii < packet.data().size();
- ii += kWordsPerFrame) {
- frames[current_frame_address] =
- packet.data().subspan(
- ii, kWordsPerFrame);
-
- auto next_address = part.GetNextFrameAddress(
- current_frame_address);
- if (!next_address) break;
-
- // Bitstreams appear to have 2 frames of
- // padding between rows.
- if (next_address->row_address() !=
- current_frame_address.row_address()) {
- ii += 2 * kWordsPerFrame;
+ case ConfigurationRegister::MASK:
+ if (packet.data().size() < 1)
+ continue;
+ mask_register = packet.data()[0];
+ break;
+ case ConfigurationRegister::CTL1:
+ if (packet.data().size() < 1)
+ continue;
+ ctl1_register =
+ packet.data()[0] & mask_register;
+ break;
+ case ConfigurationRegister::CMD:
+ if (packet.data().size() < 1)
+ continue;
+ command_register = packet.data()[0];
+ // Writes to CMD trigger an immediate action. In
+ // the case of WCFG, that is just setting a flag
+ // for the next FDIR.
+ if (command_register == 0x1) {
+ start_new_write = true;
}
- current_frame_address = *next_address;
+ break;
+ case ConfigurationRegister::IDCODE:
+ // This really should be a one-word write.
+ if (packet.data().size() < 1)
+ continue;
+
+ // If the IDCODE doesn't match our expected
+ // part, consider the bitstream invalid.
+ if (packet.data()[0] != part.idcode()) {
+ return {};
+ }
+ break;
+ case ConfigurationRegister::FAR:
+ // This really should be a one-word write.
+ if (packet.data().size() < 1)
+ continue;
+ frame_address_register = packet.data()[0];
+
+ // Per UG470, the command present in the CMD
+ // register is executed each time the FAR
+ // register is laoded with a new value. As we
+ // only care about WCFG commands, just check
+ // that here. CTRL1 is completely undocumented
+ // but looking at generated bitstreams, bit 21
+ // is used when per-frame CRC is enabled.
+ // Setting this bit seems to inhibit the
+ // re-execution of CMD during a FAR write. In
+ // practice, this is used so FAR writes can be
+ // added in the bitstream to show progress
+ // markers without impacting the actual write
+ // operation.
+ if (bit_field_get(ctl1_register, 21, 21) == 0 &&
+ command_register == 0x1) {
+ start_new_write = true;
+ }
+ break;
+ case ConfigurationRegister::FDRI: {
+ if (start_new_write) {
+ current_frame_address =
+ frame_address_register;
+ start_new_write = false;
+ }
+
+ // 7-series frames are 101-words long. Writes
+ // to this register can be multiples of that to
+ // do auto-incrementing block writes.
+ for (size_t ii = 0; ii < packet.data().size();
+ ii += kWordsPerFrame) {
+ frames[current_frame_address] =
+ packet.data().subspan(
+ ii, kWordsPerFrame);
+
+ auto next_address =
+ part.GetNextFrameAddress(
+ current_frame_address);
+ if (!next_address)
+ break;
+
+ // Bitstreams appear to have 2 frames of
+ // padding between rows.
+ if (next_address->row_address() !=
+ current_frame_address
+ .row_address()) {
+ ii += 2 * kWordsPerFrame;
+ }
+ current_frame_address = *next_address;
+ }
+ break;
}
- break;
- }
- default:
- break;
+ default:
+ break;
}
}
return Configuration(part, frames);
}
-
} // namespace xc7series
} // namespace xilinx
} // namespace prjxray
-#endif // PRJXRAY_LIB_XILINX_XC7SERIES_CONFIGURATION_H_
+#endif // PRJXRAY_LIB_XILINX_XC7SERIES_CONFIGURATION_H_
diff --git a/lib/include/prjxray/xilinx/xc7series/configuration_frame_range.h b/lib/include/prjxray/xilinx/xc7series/configuration_frame_range.h
index 4445871b..30397039 100644
--- a/lib/include/prjxray/xilinx/xc7series/configuration_frame_range.h
+++ b/lib/include/prjxray/xilinx/xc7series/configuration_frame_range.h
@@ -11,11 +11,11 @@ namespace xilinx {
namespace xc7series {
class ConfigurationFrameRange {
- public:
+ public:
ConfigurationFrameRange() : begin_(0), end_(0) {}
ConfigurationFrameRange(FrameAddress begin, FrameAddress end)
- : begin_(begin), end_(end) {};
+ : begin_(begin), end_(end){};
FrameAddress begin() const { return begin_; }
FrameAddress end() const { return end_; }
@@ -25,7 +25,7 @@ class ConfigurationFrameRange {
bool Contains(FrameAddress address) const;
- private:
+ private:
FrameAddress begin_;
FrameAddress end_;
};
@@ -35,13 +35,13 @@ class ConfigurationFrameRange {
} // namespace prjxray
namespace YAML {
-template<>
+template <>
struct convert {
static Node encode(
- const prjxray::xilinx::xc7series::ConfigurationFrameRange &rhs);
+ const prjxray::xilinx::xc7series::ConfigurationFrameRange& rhs);
static bool decode(
- const Node& node,
- prjxray::xilinx::xc7series::ConfigurationFrameRange &lhs);
+ const Node& node,
+ prjxray::xilinx::xc7series::ConfigurationFrameRange& lhs);
};
-} // namespace YAML
+} // namespace YAML
#endif // PRJXRAY_LIB_XILINX_XC7SERIES_CONFIGURATION_FRAME_RANGE_H_
diff --git a/lib/include/prjxray/xilinx/xc7series/configuration_packet.h b/lib/include/prjxray/xilinx/xc7series/configuration_packet.h
index 21baa646..80cfe9bb 100644
--- a/lib/include/prjxray/xilinx/xc7series/configuration_packet.h
+++ b/lib/include/prjxray/xilinx/xc7series/configuration_packet.h
@@ -12,10 +12,10 @@ namespace xilinx {
namespace xc7series {
class ConfigurationPacket {
- public:
+ public:
typedef std::pair,
- absl::optional>
- ParseResult;
+ absl::optional>
+ ParseResult;
enum Opcode {
NOP = 0,
@@ -24,11 +24,14 @@ class ConfigurationPacket {
/* reserved = 3 */
};
- ConfigurationPacket(unsigned int header_type, Opcode opcode,
- ConfigurationRegister address,
- const absl::Span &data)
- : header_type_(header_type), opcode_(opcode),
- address_(address), data_(std::move(data)) {}
+ ConfigurationPacket(unsigned int header_type,
+ Opcode opcode,
+ ConfigurationRegister address,
+ const absl::Span& data)
+ : header_type_(header_type),
+ opcode_(opcode),
+ address_(address),
+ data_(std::move(data)) {}
// Attempt to read a configuration packet from a sequence of
// 32-bit, big-endian words. If successful, returns the packet read and
@@ -38,22 +41,22 @@ class ConfigurationPacket {
// packet is produced. If no valid header is found, an empty span is
// returned.
static ParseResult InitWithWords(
- absl::Span words,
- const ConfigurationPacket *previous_packet = nullptr);
+ absl::Span words,
+ const ConfigurationPacket* previous_packet = nullptr);
unsigned int header_type() const { return header_type_; }
const Opcode opcode() const { return opcode_; }
const ConfigurationRegister address() const { return address_; }
- const absl::Span &data() const { return data_; }
+ const absl::Span& data() const { return data_; }
- private:
+ private:
unsigned int header_type_;
Opcode opcode_;
ConfigurationRegister address_;
absl::Span data_;
};
-std::ostream& operator<<(std::ostream& o, const ConfigurationPacket &packet);
+std::ostream& operator<<(std::ostream& o, const ConfigurationPacket& packet);
} // namespace xc7series
} // namespace xilinx
diff --git a/lib/include/prjxray/xilinx/xc7series/configuration_register.h b/lib/include/prjxray/xilinx/xc7series/configuration_register.h
index b413dab9..9f75a090 100644
--- a/lib/include/prjxray/xilinx/xc7series/configuration_register.h
+++ b/lib/include/prjxray/xilinx/xc7series/configuration_register.h
@@ -8,29 +8,29 @@ namespace xilinx {
namespace xc7series {
enum class ConfigurationRegister : unsigned int {
- CRC = 0x00,
- FAR = 0x01,
- FDRI = 0x02,
- FDRO = 0x03,
- CMD = 0x04,
- CTL0 = 0x05,
- MASK = 0x06,
- STAT = 0x07,
- LOUT = 0x08,
- COR0 = 0x09,
- MFWR = 0x0a,
- CBC = 0x0b,
- IDCODE = 0x0c,
- AXSS = 0x0d,
- COR1 = 0x0e,
- WBSTAR = 0x10,
- TIMER = 0x11,
+ CRC = 0x00,
+ FAR = 0x01,
+ FDRI = 0x02,
+ FDRO = 0x03,
+ CMD = 0x04,
+ CTL0 = 0x05,
+ MASK = 0x06,
+ STAT = 0x07,
+ LOUT = 0x08,
+ COR0 = 0x09,
+ MFWR = 0x0a,
+ CBC = 0x0b,
+ IDCODE = 0x0c,
+ AXSS = 0x0d,
+ COR1 = 0x0e,
+ WBSTAR = 0x10,
+ TIMER = 0x11,
BOOTSTS = 0x16,
- CTL1 = 0x18,
- BSPI = 0x1F,
+ CTL1 = 0x18,
+ BSPI = 0x1F,
};
-std::ostream& operator<<(std::ostream &o, const ConfigurationRegister &value);
+std::ostream& operator<<(std::ostream& o, const ConfigurationRegister& value);
} // namespace xc7series
} // namespace xilinx
diff --git a/lib/include/prjxray/xilinx/xc7series/frame_address.h b/lib/include/prjxray/xilinx/xc7series/frame_address.h
index 88ef7e82..72ce6b34 100644
--- a/lib/include/prjxray/xilinx/xc7series/frame_address.h
+++ b/lib/include/prjxray/xilinx/xc7series/frame_address.h
@@ -12,14 +12,16 @@ namespace xilinx {
namespace xc7series {
class FrameAddress {
- public:
+ public:
FrameAddress() : address_(0) {}
- FrameAddress(uint32_t address)
- : address_(address) {};
+ FrameAddress(uint32_t address) : address_(address){};
- FrameAddress(BlockType block_type, bool is_bottom_half_rows,
- uint8_t row, uint16_t column, uint8_t minor);
+ FrameAddress(BlockType block_type,
+ bool is_bottom_half_rows,
+ uint8_t row,
+ uint16_t column,
+ uint8_t minor);
operator uint32_t() const { return address_; }
@@ -29,22 +31,22 @@ class FrameAddress {
uint16_t column_address() const;
uint8_t minor_address() const;
- private:
+ private:
uint32_t address_;
};
-std::ostream &operator<<(std::ostream &o, const FrameAddress& addr);
+std::ostream& operator<<(std::ostream& o, const FrameAddress& addr);
} // namespace xc7series
} // namespace xilinx
} // namespace prjxray
namespace YAML {
-template<>
+template <>
struct convert {
- static Node encode(const prjxray::xilinx::xc7series::FrameAddress &rhs);
+ static Node encode(const prjxray::xilinx::xc7series::FrameAddress& rhs);
static bool decode(const Node& node,
- prjxray::xilinx::xc7series::FrameAddress &lhs);
+ prjxray::xilinx::xc7series::FrameAddress& lhs);
};
-} // namespace YAML
+} // namespace YAML
#endif // PRJXRAY_LIB_XILINX_XC7SERIES_FRAME_ADDRESS_H_
diff --git a/lib/include/prjxray/xilinx/xc7series/part.h b/lib/include/prjxray/xilinx/xc7series/part.h
index 5ffe891d..ad5eaff7 100644
--- a/lib/include/prjxray/xilinx/xc7series/part.h
+++ b/lib/include/prjxray/xilinx/xc7series/part.h
@@ -4,38 +4,40 @@
#include
#include
-#include
#include
+#include
namespace prjxray {
namespace xilinx {
namespace xc7series {
class Part {
- public:
- static absl::optional FromFile(const std::string &path);
+ public:
+ static absl::optional FromFile(const std::string& path);
// Constructs an invalid part with a zero IDCODE. Required for YAML
// conversion but shouldn't be used otherwise.
Part() : idcode_(0), frame_ranges_() {}
Part(uint32_t idcode,
- const std::vector &ranges)
- : idcode_(idcode), frame_ranges_(std::move(ranges)) {}
+ const std::vector& ranges)
+ : idcode_(idcode), frame_ranges_(std::move(ranges)) {}
uint32_t idcode() const { return idcode_; }
- const std::vector&
- configuration_frame_ranges() const { return frame_ranges_; }
+ const std::vector& configuration_frame_ranges()
+ const {
+ return frame_ranges_;
+ }
- absl::optional
- GetNextFrameAddress(FrameAddress address) const;
+ absl::optional GetNextFrameAddress(
+ FrameAddress address) const;
- private:
- uint32_t idcode_;
+ private:
+ uint32_t idcode_;
- // Ranges are expected to be non-overlapping.
- std::vector frame_ranges_;
+ // Ranges are expected to be non-overlapping.
+ std::vector frame_ranges_;
};
} // namespace xc7series
@@ -43,12 +45,12 @@ class Part {
} // namespace prjxray
namespace YAML {
-template<>
+template <>
struct convert {
- static Node encode(const prjxray::xilinx::xc7series::Part &rhs);
+ static Node encode(const prjxray::xilinx::xc7series::Part& rhs);
static bool decode(const Node& node,
- prjxray::xilinx::xc7series::Part &lhs);
+ prjxray::xilinx::xc7series::Part& lhs);
};
-} // namespace YAML
+} // namespace YAML
-#endif // PRJXRAY_LIB_XILINX_XC7SERIES_PART_H_
+#endif // PRJXRAY_LIB_XILINX_XC7SERIES_PART_H_
diff --git a/lib/memory_mapped_file.cc b/lib/memory_mapped_file.cc
index b1ab18fc..e6ada907 100644
--- a/lib/memory_mapped_file.cc
+++ b/lib/memory_mapped_file.cc
@@ -2,17 +2,17 @@
#include
#include
-#include
#include
+#include
#include
namespace prjxray {
std::unique_ptr MemoryMappedFile::InitWithFile(
- const std::string &path) {
-
+ const std::string& path) {
int fd = open(path.c_str(), O_RDONLY, 0);
- if (fd == -1) return nullptr;
+ if (fd == -1)
+ return nullptr;
struct stat statbuf;
if (fstat(fd, &statbuf) < 0) {
@@ -26,25 +26,26 @@ std::unique_ptr MemoryMappedFile::InitWithFile(
if (statbuf.st_size == 0) {
close(fd);
return std::unique_ptr(
- new MemoryMappedFile(nullptr, 0));
+ new MemoryMappedFile(nullptr, 0));
}
- void *file_map = mmap(NULL, statbuf.st_size, PROT_READ,
- MAP_PRIVATE | MAP_POPULATE, fd, 0);
+ void* file_map = mmap(NULL, statbuf.st_size, PROT_READ,
+ MAP_PRIVATE | MAP_POPULATE, fd, 0);
// If mmap() succeeded, the fd is no longer needed as the mapping will
// keep the file open. If mmap() failed, the fd needs to be closed
// anyway.
close(fd);
- if (file_map == MAP_FAILED) return nullptr;
+ if (file_map == MAP_FAILED)
+ return nullptr;
return std::unique_ptr(
- new MemoryMappedFile(file_map, statbuf.st_size));
+ new MemoryMappedFile(file_map, statbuf.st_size));
}
MemoryMappedFile::~MemoryMappedFile() {
munmap(data_, size_);
}
-} // namepsace prjxray
+} // namespace prjxray
diff --git a/lib/segbits_file_reader.cc b/lib/segbits_file_reader.cc
index 96e06ed9..df85fab3 100644
--- a/lib/segbits_file_reader.cc
+++ b/lib/segbits_file_reader.cc
@@ -3,26 +3,26 @@
namespace prjxray {
std::unique_ptr SegbitsFileReader::InitWithFile(
- const std::string &path) {
-
+ const std::string& path) {
auto mapped_file = MemoryMappedFile::InitWithFile(path);
- if (!mapped_file) return nullptr;
+ if (!mapped_file)
+ return nullptr;
return std::unique_ptr(
- new SegbitsFileReader(std::move(mapped_file)));
+ new SegbitsFileReader(std::move(mapped_file)));
}
SegbitsFileReader::iterator SegbitsFileReader::begin() {
- return iterator(absl::string_view(
- static_cast(mapped_file_->data()),
- mapped_file_->size()));
+ return iterator(
+ absl::string_view(static_cast(mapped_file_->data()),
+ mapped_file_->size()));
}
SegbitsFileReader::iterator SegbitsFileReader::end() {
return iterator(absl::string_view());
}
-SegbitsFileReader::value_type::value_type(const absl::string_view &view) {
+SegbitsFileReader::value_type::value_type(const absl::string_view& view) {
size_t separator_start = view.find_first_of(" \t");
if (separator_start == absl::string_view::npos) {
tag_ = view;
@@ -55,5 +55,4 @@ SegbitsFileReader::iterator& SegbitsFileReader::iterator::operator++() {
return *this;
}
-
} // namespace prjxray
diff --git a/lib/segbits_file_reader_test.cc b/lib/segbits_file_reader_test.cc
index 35764f24..3ac90e17 100644
--- a/lib/segbits_file_reader_test.cc
+++ b/lib/segbits_file_reader_test.cc
@@ -6,12 +6,13 @@
#include
TEST(SegbitsFileReaderTest, NonExistantFileReturnsNull) {
- EXPECT_FALSE(prjxray::SegbitsFileReader::InitWithFile("does_not_exist"));
+ EXPECT_FALSE(
+ prjxray::SegbitsFileReader::InitWithFile("does_not_exist"));
}
TEST(SegbitsFileReaderTest, ZeroLengthFileYieldsNoItems) {
auto segbits_reader =
- prjxray::SegbitsFileReader::InitWithFile("empty_file");
+ prjxray::SegbitsFileReader::InitWithFile("empty_file");
ASSERT_TRUE(segbits_reader);
EXPECT_EQ(segbits_reader->begin(), segbits_reader->end());
@@ -19,7 +20,7 @@ TEST(SegbitsFileReaderTest, ZeroLengthFileYieldsNoItems) {
TEST(SegbitsFileReaderTest, FileWithOneEntry) {
auto segbits_reader =
- prjxray::SegbitsFileReader::InitWithFile("one_entry.segbits");
+ prjxray::SegbitsFileReader::InitWithFile("one_entry.segbits");
ASSERT_TRUE(segbits_reader);
auto begin_iter = segbits_reader->begin();
@@ -31,7 +32,7 @@ TEST(SegbitsFileReaderTest, FileWithOneEntry) {
TEST(SegbitsFileReaderTest, FileWithOneEntryWithEmptyTag) {
auto segbits_reader = prjxray::SegbitsFileReader::InitWithFile(
- "one_entry_empty_tag.segbits");
+ "one_entry_empty_tag.segbits");
ASSERT_TRUE(segbits_reader);
auto begin_iter = segbits_reader->begin();
@@ -43,7 +44,7 @@ TEST(SegbitsFileReaderTest, FileWithOneEntryWithEmptyTag) {
TEST(SegbitsFileReaderTest, FileWithOneEntryMissingBit) {
auto segbits_reader = prjxray::SegbitsFileReader::InitWithFile(
- "one_entry_missing_bit.segbits");
+ "one_entry_missing_bit.segbits");
ASSERT_TRUE(segbits_reader);
auto begin_iter = segbits_reader->begin();
@@ -55,7 +56,7 @@ TEST(SegbitsFileReaderTest, FileWithOneEntryMissingBit) {
TEST(SegbitsFileReaderTest, FileWithOneEntryWithExtraWhitespace) {
auto segbits_reader = prjxray::SegbitsFileReader::InitWithFile(
- "one_entry_extra_whitespace.segbits");
+ "one_entry_extra_whitespace.segbits");
ASSERT_TRUE(segbits_reader);
auto begin_iter = segbits_reader->begin();
@@ -66,8 +67,8 @@ TEST(SegbitsFileReaderTest, FileWithOneEntryWithExtraWhitespace) {
}
TEST(SegbitsFileReaderTest, FileWithTwoEntries) {
- auto segbits_reader = prjxray::SegbitsFileReader::InitWithFile(
- "two_entries.segbits");
+ auto segbits_reader =
+ prjxray::SegbitsFileReader::InitWithFile("two_entries.segbits");
ASSERT_TRUE(segbits_reader);
auto iter = segbits_reader->begin();
diff --git a/lib/xilinx/xc7series/bitstream_reader.cc b/lib/xilinx/xc7series/bitstream_reader.cc
index f517587a..b390f272 100644
--- a/lib/xilinx/xc7series/bitstream_reader.cc
+++ b/lib/xilinx/xc7series/bitstream_reader.cc
@@ -6,8 +6,8 @@ namespace xc7series {
std::array BitstreamReader::kSyncWord{0xAA, 0x99, 0x55, 0x66};
-BitstreamReader::BitstreamReader(std::vector &&words)
- : words_(std::move(words)) {}
+BitstreamReader::BitstreamReader(std::vector&& words)
+ : words_(std::move(words)) {}
BitstreamReader::iterator BitstreamReader::begin() {
return iterator(absl::MakeSpan(words_));
@@ -23,14 +23,12 @@ BitstreamReader::iterator::iterator(absl::Span words) {
++(*this);
}
-BitstreamReader::iterator&
-BitstreamReader::iterator::operator++() {
+BitstreamReader::iterator& BitstreamReader::iterator::operator++() {
do {
auto new_result = ConfigurationPacket::InitWithWords(
- parse_result_.first,
- parse_result_.second.has_value() ?
- parse_result_.second.operator->() :
- nullptr);
+ parse_result_.first, parse_result_.second.has_value()
+ ? parse_result_.second.operator->()
+ : nullptr);
// If the a valid header is being found but there are
// insufficient words to yield a packet, consider it the end.
@@ -41,8 +39,7 @@ BitstreamReader::iterator::operator++() {
words_ = parse_result_.first;
parse_result_ = new_result;
- } while (!parse_result_.first.empty() &&
- !parse_result_.second);
+ } while (!parse_result_.first.empty() && !parse_result_.second);
if (!parse_result_.second) {
words_ = absl::Span();
@@ -51,21 +48,21 @@ BitstreamReader::iterator::operator++() {
return *this;
}
-bool BitstreamReader::iterator::operator==(const iterator &other) const {
+bool BitstreamReader::iterator::operator==(const iterator& other) const {
return words_ == other.words_;
}
-bool BitstreamReader::iterator::operator!=(const iterator &other) const {
+bool BitstreamReader::iterator::operator!=(const iterator& other) const {
return !(*this == other);
}
-const BitstreamReader::value_type&
-BitstreamReader::iterator::operator*() const {
+const BitstreamReader::value_type& BitstreamReader::iterator::operator*()
+ const {
return *(parse_result_.second);
}
-const BitstreamReader::value_type*
-BitstreamReader::iterator::operator->() const {
+const BitstreamReader::value_type* BitstreamReader::iterator::operator->()
+ const {
return parse_result_.second.operator->();
}
diff --git a/lib/xilinx/xc7series/bitstream_reader_test.cc b/lib/xilinx/xc7series/bitstream_reader_test.cc
index 75a55afc..1093cf7f 100644
--- a/lib/xilinx/xc7series/bitstream_reader_test.cc
+++ b/lib/xilinx/xc7series/bitstream_reader_test.cc
@@ -19,30 +19,23 @@ TEST(BitstreamReaderTest, InitWithOnlySyncReturnsObject) {
EXPECT_TRUE(reader);
}
-TEST(BitstreamReaderTest,
- InitWithSyncAfterNonWordSizedPaddingReturnsObject) {
- std::vector bitstream{
- 0xFF, 0xFE,
- 0xAA, 0x99, 0x55, 0x66
- };
+TEST(BitstreamReaderTest, InitWithSyncAfterNonWordSizedPaddingReturnsObject) {
+ std::vector bitstream{0xFF, 0xFE, 0xAA, 0x99, 0x55, 0x66};
auto reader = xc7series::BitstreamReader::InitWithBytes(bitstream);
EXPECT_TRUE(reader);
}
-TEST(BitstreamReaderTest,
- InitWithSyncAfterWordSizedPaddingReturnsObject) {
- std::vector bitstream{
- 0xFF, 0xFE, 0xFD, 0xFC,
- 0xAA, 0x99, 0x55, 0x66
- };
+TEST(BitstreamReaderTest, InitWithSyncAfterWordSizedPaddingReturnsObject) {
+ std::vector bitstream{0xFF, 0xFE, 0xFD, 0xFC,
+ 0xAA, 0x99, 0x55, 0x66};
auto reader = xc7series::BitstreamReader::InitWithBytes(bitstream);
EXPECT_TRUE(reader);
}
TEST(BitstreamReaderTest, ParsesType1Packet) {
std::vector bitstream{
- 0xAA, 0x99, 0x55, 0x66, // sync
- 0x20, 0x00, 0x00, 0x00, // NOP
+ 0xAA, 0x99, 0x55, 0x66, // sync
+ 0x20, 0x00, 0x00, 0x00, // NOP
};
auto reader = xc7series::BitstreamReader::InitWithBytes(bitstream);
ASSERT_TRUE(reader);
@@ -50,34 +43,31 @@ TEST(BitstreamReaderTest, ParsesType1Packet) {
auto first_packet = reader->begin();
EXPECT_EQ(first_packet->opcode(),
- xc7series::ConfigurationPacket::Opcode::NOP);
+ xc7series::ConfigurationPacket::Opcode::NOP);
EXPECT_EQ(++first_packet, reader->end());
}
TEST(BitstreamReaderTest, ParseType2PacketWithoutType1Fails) {
std::vector bitstream{
- 0xAA, 0x99, 0x55, 0x66, // sync
- 0x40, 0x00, 0x00, 0x00, // Type 2 NOP
+ 0xAA, 0x99, 0x55, 0x66, // sync
+ 0x40, 0x00, 0x00, 0x00, // Type 2 NOP
};
auto reader = xc7series::BitstreamReader::InitWithBytes(bitstream);
ASSERT_TRUE(reader);
EXPECT_EQ(reader->begin(), reader->end());
}
-
TEST(BitstreamReaderTest, ParsesType2AfterType1Packet) {
std::vector bitstream{
- 0xAA, 0x99, 0x55, 0x66, // sync
- 0x28, 0x00, 0x60, 0x00, // Type 1 Read zero bytes from 6
- 0x48, 0x00, 0x00, 0x04, // Type 2 write of 4 words
- 0x1, 0x2, 0x3, 0x4,
- 0x5, 0x6, 0x7, 0x8,
- 0x9, 0xA, 0xB, 0xC,
- 0xD, 0xE, 0xF, 0x10,
+ 0xAA, 0x99, 0x55, 0x66, // sync
+ 0x28, 0x00, 0x60, 0x00, // Type 1 Read zero bytes from 6
+ 0x48, 0x00, 0x00, 0x04, // Type 2 write of 4 words
+ 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8,
+ 0x9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 0x10,
};
- std::vector data_words{
- 0x01020304, 0x05060708, 0x090A0B0C, 0x0D0E0F10};
+ std::vector data_words{0x01020304, 0x05060708, 0x090A0B0C,
+ 0x0D0E0F10};
auto reader = xc7series::BitstreamReader::InitWithBytes(bitstream);
ASSERT_TRUE(reader);
@@ -85,17 +75,17 @@ TEST(BitstreamReaderTest, ParsesType2AfterType1Packet) {
auto first_packet = reader->begin();
EXPECT_EQ(first_packet->opcode(),
- xc7series::ConfigurationPacket::Opcode::Read);
+ xc7series::ConfigurationPacket::Opcode::Read);
EXPECT_EQ(first_packet->address(),
- xc7series::ConfigurationRegister::FDRO);
+ xc7series::ConfigurationRegister::FDRO);
EXPECT_EQ(first_packet->data(), absl::Span());
auto second_packet = ++first_packet;
ASSERT_NE(second_packet, reader->end());
EXPECT_EQ(second_packet->opcode(),
- xc7series::ConfigurationPacket::Opcode::Read);
+ xc7series::ConfigurationPacket::Opcode::Read);
EXPECT_EQ(second_packet->address(),
- xc7series::ConfigurationRegister::FDRO);
+ xc7series::ConfigurationRegister::FDRO);
EXPECT_EQ(first_packet->data(), absl::Span(data_words));
EXPECT_EQ(++first_packet, reader->end());
diff --git a/lib/xilinx/xc7series/block_type.cc b/lib/xilinx/xc7series/block_type.cc
index 228b7755..d74537f2 100644
--- a/lib/xilinx/xc7series/block_type.cc
+++ b/lib/xilinx/xc7series/block_type.cc
@@ -4,17 +4,17 @@ namespace prjxray {
namespace xilinx {
namespace xc7series {
-std::ostream &operator<<(std::ostream &o, BlockType value) {
+std::ostream& operator<<(std::ostream& o, BlockType value) {
switch (value) {
- case BlockType::CLB_IO_CLK:
- o << "CLB/IO/CLK";
- break;
- case BlockType::BLOCK_RAM:
- o << "Block RAM";
- break;
- case BlockType::CFG_CLB:
- o << "Config CLB";
- break;
+ case BlockType::CLB_IO_CLK:
+ o << "CLB/IO/CLK";
+ break;
+ case BlockType::BLOCK_RAM:
+ o << "Block RAM";
+ break;
+ case BlockType::CFG_CLB:
+ o << "Config CLB";
+ break;
}
return o;
@@ -27,7 +27,7 @@ std::ostream &operator<<(std::ostream &o, BlockType value) {
namespace YAML {
Node convert::encode(
- const prjxray::xilinx::xc7series::BlockType &rhs) {
+ const prjxray::xilinx::xc7series::BlockType& rhs) {
switch (rhs) {
case prjxray::xilinx::xc7series::BlockType::CLB_IO_CLK:
return Node("CLB_IO_CLK");
@@ -41,7 +41,8 @@ Node convert::encode(
}
bool YAML::convert::decode(
- const Node &node, prjxray::xilinx::xc7series::BlockType &lhs) {
+ const Node& node,
+ prjxray::xilinx::xc7series::BlockType& lhs) {
auto type_str = node.as();
if (type_str == "CLB_IO_CLK") {
@@ -58,4 +59,4 @@ bool YAML::convert::decode(
}
}
-} // namespace YAML;
+} // namespace YAML
diff --git a/lib/xilinx/xc7series/block_type_test.cc b/lib/xilinx/xc7series/block_type_test.cc
index 3420c0bd..9cab1cea 100644
--- a/lib/xilinx/xc7series/block_type_test.cc
+++ b/lib/xilinx/xc7series/block_type_test.cc
@@ -22,9 +22,9 @@ TEST(BlockTypeTest, YamlDecode) {
node.push_back("CLB_IO_CLK");
EXPECT_EQ(node[0].as(),
- xc7series::BlockType::CFG_CLB);
+ xc7series::BlockType::CFG_CLB);
EXPECT_EQ(node[1].as(),
- xc7series::BlockType::BLOCK_RAM);
+ xc7series::BlockType::BLOCK_RAM);
EXPECT_EQ(node[2].as(),
- xc7series::BlockType::CLB_IO_CLK);
+ xc7series::BlockType::CLB_IO_CLK);
}
diff --git a/lib/xilinx/xc7series/configuration_frame_range.cc b/lib/xilinx/xc7series/configuration_frame_range.cc
index b4f73a5f..3fb69235 100644
--- a/lib/xilinx/xc7series/configuration_frame_range.cc
+++ b/lib/xilinx/xc7series/configuration_frame_range.cc
@@ -17,7 +17,7 @@ namespace xc7series = prjxray::xilinx::xc7series;
namespace YAML {
Node convert::encode(
- const xc7series::ConfigurationFrameRange &rhs) {
+ const xc7series::ConfigurationFrameRange& rhs) {
Node node;
node.SetTag("xilinx/xc7series/configuration_frame_range");
node["begin"] = rhs.begin();
@@ -26,16 +26,16 @@ Node convert::encode(
}
bool convert::decode(
- const Node &node,
- xc7series::ConfigurationFrameRange &lhs) {
+ const Node& node,
+ xc7series::ConfigurationFrameRange& lhs) {
if (node.Tag() != "xilinx/xc7series/configuration_frame_range" ||
- !node["begin"] ||
- !node["end"]) return false;
+ !node["begin"] || !node["end"])
+ return false;
lhs = xc7series::ConfigurationFrameRange(
- node["begin"].as(),
- node["end"].as());
+ node["begin"].as(),
+ node["end"].as());
return true;
}
-} // namespace YAML;
+} // namespace YAML
diff --git a/lib/xilinx/xc7series/configuration_packet.cc b/lib/xilinx/xc7series/configuration_packet.cc
index 21fe01f5..f95fc4ae 100644
--- a/lib/xilinx/xc7series/configuration_packet.cc
+++ b/lib/xilinx/xc7series/configuration_packet.cc
@@ -11,65 +11,68 @@ namespace xc7series {
std::pair, absl::optional>
ConfigurationPacket::InitWithWords(absl::Span words,
- const ConfigurationPacket *previous_packet) {
+ const ConfigurationPacket* previous_packet) {
// Need at least one 32-bit word to have a valid packet header.
- if (words.size() < 1) return {words, {}};
+ if (words.size() < 1)
+ return {words, {}};
uint32_t header_type = bit_field_get(words[0], 31, 29);
switch (header_type) {
- case 0x0:
- // Type 0 is emitted at the end of a configuration row when
- // BITSTREAM.GENERAL.DEBUGBITSTREAM is set to YES. These seem
- // to be padding that are interepreted as NOPs. Since Type 0
- // packets don't exist according to UG470 and they seem to be
- // zero-filled, just consume the bytes without generating a
- // packet.
- return {words.subspan(1), {}};
- case 0x1: {
- Opcode opcode = static_cast(
- bit_field_get(words[0], 28, 27));
- ConfigurationRegister address =
- static_cast(
- bit_field_get(words[0], 26, 13));
- uint32_t data_word_count = bit_field_get(words[0], 10, 0);
+ case 0x0:
+ // Type 0 is emitted at the end of a configuration row
+ // when BITSTREAM.GENERAL.DEBUGBITSTREAM is set to YES.
+ // These seem to be padding that are interepreted as
+ // NOPs. Since Type 0 packets don't exist according to
+ // UG470 and they seem to be zero-filled, just consume
+ // the bytes without generating a packet.
+ return {words.subspan(1), {}};
+ case 0x1: {
+ Opcode opcode = static_cast(
+ bit_field_get(words[0], 28, 27));
+ ConfigurationRegister address =
+ static_cast(
+ bit_field_get(words[0], 26, 13));
+ uint32_t data_word_count =
+ bit_field_get(words[0], 10, 0);
- // If the full packet has not been received, return as though
- // no valid packet was found.
- if (data_word_count > words.size() - 1) {
- return {words, {}};
+ // If the full packet has not been received, return as
+ // though no valid packet was found.
+ if (data_word_count > words.size() - 1) {
+ return {words, {}};
+ }
+
+ return {words.subspan(data_word_count + 1),
+ {{header_type, opcode, address,
+ words.subspan(1, data_word_count)}}};
}
+ case 0x2: {
+ absl::optional packet;
+ Opcode opcode = static_cast(
+ bit_field_get(words[0], 28, 27));
+ uint32_t data_word_count =
+ bit_field_get(words[0], 26, 0);
- return {words.subspan(data_word_count+1),
- {{header_type, opcode, address,
- words.subspan(1, data_word_count)}}};
- }
- case 0x2: {
- absl::optional packet;
- Opcode opcode = static_cast(
- bit_field_get(words[0], 28, 27));
- uint32_t data_word_count = bit_field_get(words[0], 26, 0);
+ // If the full packet has not been received, return as
+ // though no valid packet was found.
+ if (data_word_count > words.size() - 1) {
+ return {words, {}};
+ }
- // If the full packet has not been received, return as though
- // no valid packet was found.
- if (data_word_count > words.size() - 1) {
- return {words, {}};
+ if (previous_packet) {
+ packet = ConfigurationPacket(
+ header_type, opcode,
+ previous_packet->address(),
+ words.subspan(1, data_word_count));
+ }
+
+ return {words.subspan(data_word_count + 1), packet};
}
-
- if (previous_packet) {
- packet = ConfigurationPacket(
- header_type, opcode,
- previous_packet->address(),
- words.subspan(1, data_word_count));
- }
-
- return {words.subspan(data_word_count + 1), packet};
- }
- default:
- return {{}, {}};
+ default:
+ return {{}, {}};
}
}
-std::ostream& operator<<(std::ostream& o, const ConfigurationPacket &packet) {
+std::ostream& operator<<(std::ostream& o, const ConfigurationPacket& packet) {
switch (packet.opcode()) {
case ConfigurationPacket::Opcode::NOP:
o << "[NOP]" << std::endl;
@@ -101,7 +104,7 @@ std::ostream& operator<<(std::ostream& o, const ConfigurationPacket &packet) {
o << std::setw(8) << std::hex;
o << packet.data()[ii] << " ";
- if ((ii+1) % 4 == 0) {
+ if ((ii + 1) % 4 == 0) {
o << std::endl;
}
}
diff --git a/lib/xilinx/xc7series/configuration_packet_test.cc b/lib/xilinx/xc7series/configuration_packet_test.cc
index fcf27d53..9d1ee271 100644
--- a/lib/xilinx/xc7series/configuration_packet_test.cc
+++ b/lib/xilinx/xc7series/configuration_packet_test.cc
@@ -10,26 +10,26 @@ namespace xc7series = prjxray::xilinx::xc7series;
constexpr uint32_t kType1NOP = prjxray::bit_field_set(0, 31, 29, 0x1);
-constexpr uint32_t MakeType1(const int opcode, const int address,
- const int word_count) {
+constexpr uint32_t MakeType1(const int opcode,
+ const int address,
+ const int word_count) {
return prjxray::bit_field_set(
- prjxray::bit_field_set(
- prjxray::bit_field_set(
- prjxray::bit_field_set(0x0, 31, 29, 0x1),
- 28, 27, opcode),
- 26, 13, address),
- 10, 0, word_count);
+ prjxray::bit_field_set(
+ prjxray::bit_field_set(
+ prjxray::bit_field_set(0x0, 31, 29, 0x1), 28, 27,
+ opcode),
+ 26, 13, address),
+ 10, 0, word_count);
}
constexpr uint32_t MakeType2(const int opcode, const int word_count) {
return prjxray::bit_field_set(
- prjxray::bit_field_set(
- prjxray::bit_field_set(0x0, 31, 29, 0x2),
- 28, 27, opcode),
- 26, 0, word_count);
+ prjxray::bit_field_set(
+ prjxray::bit_field_set(0x0, 31, 29, 0x2), 28, 27,
+ opcode),
+ 26, 0, word_count);
}
-
TEST(ConfigPacket, InitWithZeroBytes) {
auto packet = xc7series::ConfigurationPacket::InitWithWords({});
@@ -44,9 +44,9 @@ TEST(ConfigPacket, InitWithType1Nop) {
EXPECT_EQ(packet.first, absl::Span());
ASSERT_TRUE(packet.second);
EXPECT_EQ(packet.second->opcode(),
- xc7series::ConfigurationPacket::Opcode::NOP);
+ xc7series::ConfigurationPacket::Opcode::NOP);
EXPECT_EQ(packet.second->address(),
- xc7series::ConfigurationRegister::CRC);
+ xc7series::ConfigurationRegister::CRC);
EXPECT_EQ(packet.second->data(), absl::Span());
}
@@ -57,9 +57,9 @@ TEST(ConfigPacket, InitWithType1Read) {
EXPECT_EQ(packet.first, absl::Span());
ASSERT_TRUE(packet.second);
EXPECT_EQ(packet.second->opcode(),
- xc7series::ConfigurationPacket::Opcode::Read);
+ xc7series::ConfigurationPacket::Opcode::Read);
EXPECT_EQ(packet.second->address(),
- xc7series::ConfigurationRegister::FDRI);
+ xc7series::ConfigurationRegister::FDRI);
EXPECT_EQ(packet.second->data(), word_span.subspan(1));
}
@@ -70,9 +70,9 @@ TEST(ConfigPacket, InitWithType1Write) {
EXPECT_EQ(packet.first, absl::Span());
ASSERT_TRUE(packet.second);
EXPECT_EQ(packet.second->opcode(),
- xc7series::ConfigurationPacket::Opcode::Write);
+ xc7series::ConfigurationPacket::Opcode::Write);
EXPECT_EQ(packet.second->address(),
- xc7series::ConfigurationRegister::FDRO);
+ xc7series::ConfigurationRegister::FDRO);
EXPECT_EQ(packet.second->data(), word_span.subspan(1));
}
@@ -86,20 +86,19 @@ TEST(ConfigPacket, InitWithType2WithoutPreviousPacketFails) {
TEST(ConfigPacket, InitWithType2WithPreviousPacket) {
xc7series::ConfigurationPacket previous_packet(
- static_cast(0x1),
- xc7series::ConfigurationPacket::Opcode::Read,
- xc7series::ConfigurationRegister::MFWR,
- absl::Span());
+ static_cast(0x1),
+ xc7series::ConfigurationPacket::Opcode::Read,
+ xc7series::ConfigurationRegister::MFWR, absl::Span());
std::vector words{
- MakeType2(0x01, 12), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
+ MakeType2(0x01, 12), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
absl::Span word_span(words);
auto packet = xc7series::ConfigurationPacket::InitWithWords(
- word_span, &previous_packet);
+ word_span, &previous_packet);
EXPECT_EQ(packet.first, absl::Span());
ASSERT_TRUE(packet.second);
EXPECT_EQ(packet.second->opcode(),
- xc7series::ConfigurationPacket::Opcode::Read);
+ xc7series::ConfigurationPacket::Opcode::Read);
EXPECT_EQ(packet.second->address(),
- xc7series::ConfigurationRegister::MFWR);
+ xc7series::ConfigurationRegister::MFWR);
EXPECT_EQ(packet.second->data(), word_span.subspan(1));
}
diff --git a/lib/xilinx/xc7series/configuration_register.cc b/lib/xilinx/xc7series/configuration_register.cc
index 9aef4857..6337e4da 100644
--- a/lib/xilinx/xc7series/configuration_register.cc
+++ b/lib/xilinx/xc7series/configuration_register.cc
@@ -4,7 +4,7 @@ namespace prjxray {
namespace xilinx {
namespace xc7series {
-std::ostream& operator<<(std::ostream &o, const ConfigurationRegister &value) {
+std::ostream& operator<<(std::ostream& o, const ConfigurationRegister& value) {
switch (value) {
case ConfigurationRegister::CRC:
return o << "CRC";
@@ -51,7 +51,6 @@ std::ostream& operator<<(std::ostream &o, const ConfigurationRegister &value) {
}
};
-
} // namespace xc7series
} // namespace xilinx
} // namespace prjxray
diff --git a/lib/xilinx/xc7series/configuration_test.cc b/lib/xilinx/xc7series/configuration_test.cc
index 62d8facc..9275a900 100644
--- a/lib/xilinx/xc7series/configuration_test.cc
+++ b/lib/xilinx/xc7series/configuration_test.cc
@@ -15,7 +15,7 @@ namespace xc7series = prjxray::xilinx::xc7series;
TEST(ConfigurationTest, ConstructFromPacketsWithSingleFrame) {
std::vector test_part_ranges;
test_part_ranges.push_back(
- xc7series::ConfigurationFrameRange(0x4567, 0x4568));
+ xc7series::ConfigurationFrameRange(0x4567, 0x4568));
xc7series::Part test_part(0x1234, test_part_ranges);
@@ -25,33 +25,34 @@ TEST(ConfigurationTest, ConstructFromPacketsWithSingleFrame) {
std::vector frame(101, 0xAA);
std::vector packets{
- {
- static_cast(0x1),
- xc7series::ConfigurationPacket::Opcode::Write,
- xc7series::ConfigurationRegister::IDCODE,
- absl::MakeSpan(idcode),
- },
- {
- static_cast(0x1),
- xc7series::ConfigurationPacket::Opcode::Write,
- xc7series::ConfigurationRegister::FAR,
- absl::MakeSpan(frame_address),
- },
- {
- static_cast(0x1),
- xc7series::ConfigurationPacket::Opcode::Write,
- xc7series::ConfigurationRegister::CMD,
- absl::MakeSpan(cmd),
- },
- {
- static_cast(0x1),
- xc7series::ConfigurationPacket::Opcode::Write,
- xc7series::ConfigurationRegister::FDRI,
- absl::MakeSpan(frame),
- },
+ {
+ static_cast(0x1),
+ xc7series::ConfigurationPacket::Opcode::Write,
+ xc7series::ConfigurationRegister::IDCODE,
+ absl::MakeSpan(idcode),
+ },
+ {
+ static_cast(0x1),
+ xc7series::ConfigurationPacket::Opcode::Write,
+ xc7series::ConfigurationRegister::FAR,
+ absl::MakeSpan(frame_address),
+ },
+ {
+ static_cast(0x1),
+ xc7series::ConfigurationPacket::Opcode::Write,
+ xc7series::ConfigurationRegister::CMD,
+ absl::MakeSpan(cmd),
+ },
+ {
+ static_cast(0x1),
+ xc7series::ConfigurationPacket::Opcode::Write,
+ xc7series::ConfigurationRegister::FDRI,
+ absl::MakeSpan(frame),
+ },
};
- auto test_config = xc7series::Configuration::InitWithPackets(test_part, packets);
+ auto test_config =
+ xc7series::Configuration::InitWithPackets(test_part, packets);
ASSERT_TRUE(test_config);
EXPECT_EQ(test_config->part().idcode(), static_cast(0x1234));
@@ -62,9 +63,9 @@ TEST(ConfigurationTest, ConstructFromPacketsWithSingleFrame) {
TEST(ConfigurationTest, ConstructFromPacketsWithAutoincrement) {
std::vector test_part_ranges;
test_part_ranges.push_back(
- xc7series::ConfigurationFrameRange(0x4560, 0x4570));
+ xc7series::ConfigurationFrameRange(0x4560, 0x4570));
test_part_ranges.push_back(
- xc7series::ConfigurationFrameRange(0x4580, 0x4590));
+ xc7series::ConfigurationFrameRange(0x4580, 0x4590));
xc7series::Part test_part(0x1234, test_part_ranges);
@@ -75,88 +76,99 @@ TEST(ConfigurationTest, ConstructFromPacketsWithAutoincrement) {
std::fill_n(frame.begin() + 101, 101, 0xBB);
std::vector packets{
- {
- static_cast(0x1),
- xc7series::ConfigurationPacket::Opcode::Write,
- xc7series::ConfigurationRegister::IDCODE,
- absl::MakeSpan(idcode),
- },
- {
- static_cast(0x1),
- xc7series::ConfigurationPacket::Opcode::Write,
- xc7series::ConfigurationRegister::FAR,
- absl::MakeSpan(frame_address),
- },
- {
- static_cast(0x1),
- xc7series::ConfigurationPacket::Opcode::Write,
- xc7series::ConfigurationRegister::CMD,
- absl::MakeSpan(cmd),
- },
- {
- static_cast(0x1),
- xc7series::ConfigurationPacket::Opcode::Write,
- xc7series::ConfigurationRegister::FDRI,
- absl::MakeSpan(frame),
- },
+ {
+ static_cast(0x1),
+ xc7series::ConfigurationPacket::Opcode::Write,
+ xc7series::ConfigurationRegister::IDCODE,
+ absl::MakeSpan(idcode),
+ },
+ {
+ static_cast(0x1),
+ xc7series::ConfigurationPacket::Opcode::Write,
+ xc7series::ConfigurationRegister::FAR,
+ absl::MakeSpan(frame_address),
+ },
+ {
+ static_cast(0x1),
+ xc7series::ConfigurationPacket::Opcode::Write,
+ xc7series::ConfigurationRegister::CMD,
+ absl::MakeSpan(cmd),
+ },
+ {
+ static_cast(0x1),
+ xc7series::ConfigurationPacket::Opcode::Write,
+ xc7series::ConfigurationRegister::FDRI,
+ absl::MakeSpan(frame),
+ },
};
- auto test_config = xc7series::Configuration::InitWithPackets(test_part, packets);
+ auto test_config =
+ xc7series::Configuration::InitWithPackets(test_part, packets);
ASSERT_TRUE(test_config);
absl::Span frame_span(frame);
EXPECT_EQ(test_config->part().idcode(), static_cast(0x1234));
EXPECT_EQ(test_config->frames().size(), static_cast(2));
- EXPECT_EQ(test_config->frames().at(0x456F), std::vector(101, 0xAA));
- EXPECT_EQ(test_config->frames().at(0x4580), std::vector(101, 0xBB));
+ EXPECT_EQ(test_config->frames().at(0x456F),
+ std::vector(101, 0xAA));
+ EXPECT_EQ(test_config->frames().at(0x4580),
+ std::vector(101, 0xBB));
}
-TEST(ConfigurationTest, DebugAndPerFrameCrcBitstreamsProduceEqualConfigurations) {
+TEST(ConfigurationTest,
+ DebugAndPerFrameCrcBitstreamsProduceEqualConfigurations) {
auto part = xc7series::Part::FromFile("configuration_test.yaml");
ASSERT_TRUE(part);
auto debug_bitstream = prjxray::MemoryMappedFile::InitWithFile(
- "configuration_test.debug.bit");
+ "configuration_test.debug.bit");
ASSERT_TRUE(debug_bitstream);
auto debug_reader = xc7series::BitstreamReader::InitWithBytes(
- debug_bitstream->as_bytes());
+ debug_bitstream->as_bytes());
ASSERT_TRUE(debug_reader);
- auto debug_configuration = xc7series::Configuration::InitWithPackets(
- *part, *debug_reader);
+ auto debug_configuration =
+ xc7series::Configuration::InitWithPackets(*part, *debug_reader);
ASSERT_TRUE(debug_configuration);
auto perframecrc_bitstream = prjxray::MemoryMappedFile::InitWithFile(
- "configuration_test.perframecrc.bit");
+ "configuration_test.perframecrc.bit");
ASSERT_TRUE(perframecrc_bitstream);
auto perframecrc_reader = xc7series::BitstreamReader::InitWithBytes(
- perframecrc_bitstream->as_bytes());
+ perframecrc_bitstream->as_bytes());
ASSERT_TRUE(perframecrc_reader);
- auto perframecrc_configuration = xc7series::Configuration::InitWithPackets(
- *part, *perframecrc_reader);
+ auto perframecrc_configuration =
+ xc7series::Configuration::InitWithPackets(*part,
+ *perframecrc_reader);
ASSERT_TRUE(perframecrc_configuration);
for (auto debug_frame : debug_configuration->frames()) {
- auto perframecrc_frame = perframecrc_configuration->frames().find(debug_frame.first);
- if (perframecrc_frame == perframecrc_configuration->frames().end()) {
- ADD_FAILURE() << debug_frame.first << ": missing in perframecrc bitstream";
+ auto perframecrc_frame =
+ perframecrc_configuration->frames().find(debug_frame.first);
+ if (perframecrc_frame ==
+ perframecrc_configuration->frames().end()) {
+ ADD_FAILURE() << debug_frame.first
+ << ": missing in perframecrc bitstream";
continue;
}
for (int ii = 0; ii < 101; ++ii) {
- EXPECT_EQ(perframecrc_frame->second[ii], debug_frame.second[ii])
- << debug_frame.first << ": word " << ii;
+ EXPECT_EQ(perframecrc_frame->second[ii],
+ debug_frame.second[ii])
+ << debug_frame.first << ": word " << ii;
}
}
for (auto perframecrc_frame : perframecrc_configuration->frames()) {
- auto debug_frame = debug_configuration->frames().find(perframecrc_frame.first);
+ auto debug_frame =
+ debug_configuration->frames().find(perframecrc_frame.first);
if (debug_frame == debug_configuration->frames().end()) {
ADD_FAILURE() << perframecrc_frame.first
- << ": unexpectedly present in perframecrc bitstream";
+ << ": unexpectedly present in "
+ "perframecrc bitstream";
}
}
}
@@ -166,47 +178,52 @@ TEST(ConfigurationTest, DebugAndNormalBitstreamsProduceEqualConfigurations) {
ASSERT_TRUE(part);
auto debug_bitstream = prjxray::MemoryMappedFile::InitWithFile(
- "configuration_test.debug.bit");
+ "configuration_test.debug.bit");
ASSERT_TRUE(debug_bitstream);
auto debug_reader = xc7series::BitstreamReader::InitWithBytes(
- debug_bitstream->as_bytes());
+ debug_bitstream->as_bytes());
ASSERT_TRUE(debug_reader);
- auto debug_configuration = xc7series::Configuration::InitWithPackets(
- *part, *debug_reader);
+ auto debug_configuration =
+ xc7series::Configuration::InitWithPackets(*part, *debug_reader);
ASSERT_TRUE(debug_configuration);
- auto normal_bitstream = prjxray::MemoryMappedFile::InitWithFile(
- "configuration_test.bit");
+ auto normal_bitstream =
+ prjxray::MemoryMappedFile::InitWithFile("configuration_test.bit");
ASSERT_TRUE(normal_bitstream);
auto normal_reader = xc7series::BitstreamReader::InitWithBytes(
- normal_bitstream->as_bytes());
+ normal_bitstream->as_bytes());
ASSERT_TRUE(normal_reader);
- auto normal_configuration = xc7series::Configuration::InitWithPackets(
- *part, *normal_reader);
+ auto normal_configuration =
+ xc7series::Configuration::InitWithPackets(*part, *normal_reader);
ASSERT_TRUE(normal_configuration);
for (auto debug_frame : debug_configuration->frames()) {
- auto normal_frame = normal_configuration->frames().find(debug_frame.first);
+ auto normal_frame =
+ normal_configuration->frames().find(debug_frame.first);
if (normal_frame == normal_configuration->frames().end()) {
- ADD_FAILURE() << debug_frame.first << ": missing in normal bitstream";
+ ADD_FAILURE() << debug_frame.first
+ << ": missing in normal bitstream";
continue;
}
for (int ii = 0; ii < 101; ++ii) {
- EXPECT_EQ(normal_frame->second[ii], debug_frame.second[ii])
- << debug_frame.first << ": word " << ii;
+ EXPECT_EQ(normal_frame->second[ii],
+ debug_frame.second[ii])
+ << debug_frame.first << ": word " << ii;
}
}
for (auto normal_frame : normal_configuration->frames()) {
- auto debug_frame = debug_configuration->frames().find(normal_frame.first);
+ auto debug_frame =
+ debug_configuration->frames().find(normal_frame.first);
if (debug_frame == debug_configuration->frames().end()) {
- ADD_FAILURE() << normal_frame.first
- << ": unexpectedly present in normal bitstream";
+ ADD_FAILURE()
+ << normal_frame.first
+ << ": unexpectedly present in normal bitstream";
}
}
}
diff --git a/lib/xilinx/xc7series/frame_address.cc b/lib/xilinx/xc7series/frame_address.cc
index 4f885816..04bf71e2 100644
--- a/lib/xilinx/xc7series/frame_address.cc
+++ b/lib/xilinx/xc7series/frame_address.cc
@@ -8,8 +8,11 @@ namespace prjxray {
namespace xilinx {
namespace xc7series {
-FrameAddress::FrameAddress(BlockType block_type, bool is_bottom_half_rows,
- uint8_t row, uint16_t column, uint8_t minor) {
+FrameAddress::FrameAddress(BlockType block_type,
+ bool is_bottom_half_rows,
+ uint8_t row,
+ uint16_t column,
+ uint8_t minor) {
address_ = bit_field_set(0, 25, 23, block_type);
address_ = bit_field_set(address_, 22, 22, is_bottom_half_rows);
address_ = bit_field_set(address_, 21, 17, row);
@@ -37,23 +40,16 @@ uint8_t FrameAddress::minor_address() const {
return bit_field_get(address_, 6, 0);
}
-std::ostream &operator<<(std::ostream &o, const FrameAddress& addr) {
- o << "["
- << std::hex << std::showbase << std::setw(10)
- << static_cast