mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-06-20 21:03:40 +00:00
Code Activity

experimenting with test_cell

Browse source
This commit is contained in:
Emil J. Tywoniak 2024-06-17 19:14:39 +02:00
parent fbdfff168b
commit 43d8c7f352
4 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -14,11 +14,11 @@
}; };
# TODO: don't override src when ./abc is empty # TODO: don't override src when ./abc is empty
# which happens when the command used is `nix build` and not `nix build ?submodules=1` # which happens when the command used is `nix build` and not `nix build ?submodules=1`
abc-verifier = pkgs.abc-verifier.overrideAttrs(x: y: {src = ./abc;}); abc-verifier = pkgs.abc-verifier;
yosys = pkgs.llvmPackages.libcxxStdenv.mkDerivation { yosys = pkgs.llvmPackages.libcxxStdenv.mkDerivation {
name = "yosys"; name = "yosys";
src = ./. ; src = ./. ;
buildInputs = with pkgs; [ bison flex libffi tcl readline python3 llvmPackages.libcxxClang zlib git pkg-configUpstream tracy ]; buildInputs = with pkgs; [ stdenv.cc.cc bison flex libffi tcl readline python3 zlib git pkg-configUpstream tracy ];
checkInputs = with pkgs; [ gtest ]; checkInputs = with pkgs; [ gtest ];
propagatedBuildInputs = [ abc-verifier ]; propagatedBuildInputs = [ abc-verifier ];
preConfigure = "make config-clang"; preConfigure = "make config-clang";
@ -42,7 +42,7 @@
packages.default = yosys; packages.default = yosys;
defaultPackage = yosys; defaultPackage = yosys;
devShell = pkgs.mkShell { devShell = pkgs.mkShell {
buildInputs = with pkgs; [ clang bison flex libffi tcl readline python3 llvmPackages.libcxxClang zlib git gtest abc-verifier tracy ]; buildInputs = with pkgs; [ stdenv.cc.cc bison flex libffi tcl readline python3 zlib git gtest abc-verifier tracy ];
}; };
} }
); );

17
kernel/rtlil.cc
View file

@ -28,6 +28,7 @@
#include <string.h> #include <string.h>
#include <algorithm> #include <algorithm>
#include <iostream> #include <iostream>
#include <iomanip>
YOSYS_NAMESPACE_BEGIN YOSYS_NAMESPACE_BEGIN
@ -2424,6 +2425,20 @@ RTLIL::Wire *RTLIL::Module::addWire(RTLIL::IdString name, const RTLIL::Wire *oth
return wire; return wire;
} }
template<typename AAAA>
void scream(AAAA* aaa) {
unsigned char *ptr = reinterpret_cast<unsigned char*>(aaa);
for (size_t i = 0; i < sizeof(AAAA); ++i) {
std::cout << std::hex << std::setw(2) << std::setfill('0') << static_cast<int>(ptr[i]) << ' ';
}
std::cout << std::endl;
}
template<typename AAAA>
void scream(const char* ctx, AAAA* aaa) {
log("%s\n", ctx);
scream(aaa);
}
RTLIL::Cell *RTLIL::Module::addCell(RTLIL::IdString name, RTLIL::IdString type) RTLIL::Cell *RTLIL::Module::addCell(RTLIL::IdString name, RTLIL::IdString type)
{ {
RTLIL::Cell *cell = new RTLIL::Cell; RTLIL::Cell *cell = new RTLIL::Cell;
@ -2431,6 +2446,7 @@ RTLIL::Cell *RTLIL::Module::addCell(RTLIL::IdString name, RTLIL::IdString type)
log("ptr 0x%016X\n", cell); log("ptr 0x%016X\n", cell);
cell->name = name; cell->name = name;
cell->type = type; cell->type = type;
scream("addCell pre", cell);
if (RTLIL::Cell::is_legacy_type(type)) { if (RTLIL::Cell::is_legacy_type(type)) {
cell->legacy = new RTLIL::OldCell; cell->legacy = new RTLIL::OldCell;
cell->legacy->name = name; cell->legacy->name = name;
@ -2448,6 +2464,7 @@ RTLIL::Cell *RTLIL::Module::addCell(RTLIL::IdString name, RTLIL::IdString type)
new (&conn.second) SigSpec(); new (&conn.second) SigSpec();
} }
} }
scream("addCell post", cell);
add(cell); add(cell);
return cell; return cell;
} }

23
kernel/rtlil.h
View file

@ -1614,7 +1614,7 @@ public:
}; };
// $not // $not etc
struct RTLIL::Unary { struct RTLIL::Unary {
SigSpec a; SigSpec a;
SigSpec y; SigSpec y;
@ -1662,7 +1662,6 @@ public:
RTLIL::IdString type; RTLIL::IdString type;
RTLIL::IdString name; // TODO delete? RTLIL::IdString name; // TODO delete?
RTLIL::Module* module; // TODO delete RTLIL::Module* module; // TODO delete
bool has_attrs;
union { union {
RTLIL::Unary not_; RTLIL::Unary not_;
RTLIL::Unary pos; RTLIL::Unary pos;
@ -1869,8 +1868,8 @@ public:
typedef std::input_iterator_tag iterator_category; typedef std::input_iterator_tag iterator_category;
typedef std::pair<IdString, Const> value_type; typedef std::pair<IdString, Const> value_type;
typedef ptrdiff_t difference_type; typedef ptrdiff_t difference_type;
typedef std::pair<IdString, Const*> pointer; typedef std::pair<IdString, const Const*> pointer;
typedef std::pair<IdString, Const&> reference; typedef std::pair<IdString, const Const&> reference;
Cell* parent; Cell* parent;
int position; int position;
public: public:
@ -1885,7 +1884,7 @@ public:
bool operator!=(const const_iterator &other) const { bool operator!=(const const_iterator &other) const {
return !(*this == other); return !(*this == other);
} }
const std::pair<IdString, Const&> operator*() const { const std::pair<IdString, const Const&> operator*() const {
if (parent->is_legacy()) { if (parent->is_legacy()) {
auto it = parent->legacy->parameters.begin(); auto it = parent->legacy->parameters.begin();
it += position; it += position;
@ -1902,8 +1901,8 @@ public:
throw std::out_of_range("FakeParams::const_iterator::operator*() const"); throw std::out_of_range("FakeParams::const_iterator::operator*() const");
} }
} }
std::pair<IdString, Const&> operator->() { return operator*(); } // std::pair<IdString, Const&> operator->() { return operator*(); }
const std::pair<IdString, Const&> operator->() const { return operator*(); } const std::pair<IdString, const Const&> operator->() const { return operator*(); }
}; };
const_iterator begin() const { const_iterator begin() const {
return const_iterator(parent, 0); return const_iterator(parent, 0);
@ -2116,8 +2115,8 @@ public:
typedef std::input_iterator_tag iterator_category; typedef std::input_iterator_tag iterator_category;
typedef std::pair<IdString, SigSpec> value_type; typedef std::pair<IdString, SigSpec> value_type;
typedef ptrdiff_t difference_type; typedef ptrdiff_t difference_type;
typedef std::pair<IdString, SigSpec*> pointer; typedef std::pair<IdString, const SigSpec*> pointer;
typedef std::pair<IdString, SigSpec&> reference; typedef std::pair<IdString, const SigSpec&> reference;
Cell* parent; Cell* parent;
int position; int position;
public: public:
@ -2132,7 +2131,7 @@ public:
bool operator!=(const const_iterator &other) const { bool operator!=(const const_iterator &other) const {
return !(*this == other); return !(*this == other);
} }
const std::pair<IdString, SigSpec&> operator*() const { const std::pair<IdString, const SigSpec&> operator*() const {
if (parent->is_legacy()) { if (parent->is_legacy()) {
auto it = parent->legacy->connections_.begin(); auto it = parent->legacy->connections_.begin();
it += position; it += position;
@ -2149,8 +2148,8 @@ public:
throw std::out_of_range("FakeConns::const_iterator::operator*() const"); throw std::out_of_range("FakeConns::const_iterator::operator*() const");
} }
} }
std::pair<IdString, SigSpec&> operator->() { return operator*(); } // std::pair<IdString, const SigSpec&> operator->() { return operator*(); }
const std::pair<IdString, SigSpec&> operator->() const { return operator*(); } const std::pair<IdString, const SigSpec&> operator->() const { return operator*(); }
}; };
const_iterator begin() const { const_iterator begin() const {
return const_iterator(parent, 0); return const_iterator(parent, 0);

4
passes/tests/test_cell.cc
View file

@ -41,6 +41,10 @@ static void create_gold_module(RTLIL::Design *design, RTLIL::IdString cell_type,
{ {
RTLIL::Module *module = design->addModule(ID(gold)); RTLIL::Module *module = design->addModule(ID(gold));
RTLIL::Cell *cell = module->addCell(ID(UUT), cell_type); RTLIL::Cell *cell = module->addCell(ID(UUT), cell_type);
for (auto para : cell->parameters)
log("param %s is %s\n", para.first.c_str(), para.second.as_string().c_str());
// for (auto para : cell->connections)
// log("param %s is %s\n", para.first.c_str(), para.second.as_string());
RTLIL::Wire *wire; RTLIL::Wire *wire;
if (cell_type.in(ID($mux), ID($pmux))) if (cell_type.in(ID($mux), ID($pmux)))