Added $macc cell type
authorClifford Wolf <clifford@clifford.at>
Sat, 6 Sep 2014 13:47:46 +0000 (15:47 +0200)
committerClifford Wolf <clifford@clifford.at>
Sat, 6 Sep 2014 13:47:46 +0000 (15:47 +0200)
kernel/celltypes.h
kernel/macc.h [new file with mode: 0644]
kernel/rtlil.cc
passes/tests/test_cell.cc

index a8d88603ecb5c42ada9c5e348c18d05b228ebeeb..74e9f1fd50fa8552eed30c98abe6c2b01460aa58 100644 (file)
 #ifndef CELLTYPES_H
 #define CELLTYPES_H
 
-#include <set>
-#include <string>
-#include <stdlib.h>
+#include <kernel/yosys.h>
 
-#include <kernel/rtlil.h>
-#include <kernel/log.h>
+YOSYS_NAMESPACE_BEGIN
 
 struct CellType
 {
@@ -96,7 +93,7 @@ struct CellTypes
                        "$shl", "$shr", "$sshl", "$sshr", "$shift", "$shiftx",
                        "$lt", "$le", "$eq", "$ne", "$eqx", "$nex", "$ge", "$gt",
                        "$add", "$sub", "$mul", "$div", "$mod", "$pow",
-                       "$logic_and", "$logic_or", "$concat"
+                       "$logic_and", "$logic_or", "$concat", "$macc"
                };
 
                for (auto type : unary_ops)
@@ -361,5 +358,7 @@ struct CellTypes
        }
 };
 
+YOSYS_NAMESPACE_END
+
 #endif
 
diff --git a/kernel/macc.h b/kernel/macc.h
new file mode 100644 (file)
index 0000000..362acab
--- /dev/null
@@ -0,0 +1,171 @@
+/*
+ *  yosys -- Yosys Open SYnthesis Suite
+ *
+ *  Copyright (C) 2012  Clifford Wolf <clifford@clifford.at>
+ *  
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *  
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef MACC_H
+#define MACC_H
+
+#include "kernel/yosys.h"
+
+YOSYS_NAMESPACE_BEGIN
+
+struct Macc
+{
+       struct port_t {
+               RTLIL::SigSpec in_a, in_b;
+               bool is_signed, do_subtract;
+       };
+
+       std::vector<port_t> ports;
+       RTLIL::SigSpec bit_ports;
+
+       void from_cell(RTLIL::Cell *cell)
+       {
+               RTLIL::SigSpec port_a = cell->getPort("\\A");
+
+               ports.clear();
+               bit_ports = cell->getPort("\\B");
+
+               std::vector<RTLIL::State> config_bits = cell->getParam("\\CONFIG").bits;
+               int config_width = cell->getParam("\\CONFIG_WIDTH").as_int();
+               int config_cursor = 0;
+
+               log_assert(SIZE(config_bits) >= config_width);
+
+               int num_bits = 0;
+               if (config_bits[config_cursor++] == RTLIL::S1) num_bits |= 1;
+               if (config_bits[config_cursor++] == RTLIL::S1) num_bits |= 2;
+               if (config_bits[config_cursor++] == RTLIL::S1) num_bits |= 4;
+               if (config_bits[config_cursor++] == RTLIL::S1) num_bits |= 8;
+
+               int port_a_cursor = 0;
+               while (port_a_cursor < SIZE(port_a))
+               {
+                       log_assert(config_cursor + 2 + 2*num_bits <= config_width);
+
+                       port_t this_port;
+                       this_port.is_signed = config_bits[config_cursor++] == RTLIL::S1;
+                       this_port.do_subtract = config_bits[config_cursor++] == RTLIL::S1;
+
+                       int size_a = 0;
+                       for (int i = 0; i < num_bits; i++)
+                               if (config_bits[config_cursor++] == RTLIL::S1)
+                                       size_a |= 1 << i;
+
+                       this_port.in_a = port_a.extract(port_a_cursor, size_a);
+                       port_a_cursor += size_a;
+
+                       int size_b = 0;
+                       for (int i = 0; i < num_bits; i++)
+                               if (config_bits[config_cursor++] == RTLIL::S1)
+                                       size_b |= 1 << i;
+
+                       this_port.in_b = port_a.extract(port_a_cursor, size_b);
+                       port_a_cursor += size_b;
+
+                       if (size_a || size_b)
+                               ports.push_back(this_port);
+               }
+
+               log_assert(config_cursor == config_width);
+               log_assert(port_a_cursor == SIZE(port_a));
+       }
+
+       void to_cell(RTLIL::Cell *cell) const
+       {
+               RTLIL::SigSpec port_a;
+               std::vector<RTLIL::State> config_bits;
+               int max_size = 0, num_bits = 0;
+
+               for (auto &port : ports) {
+                       max_size = std::max(max_size, SIZE(port.in_a));
+                       max_size = std::max(max_size, SIZE(port.in_b));
+               }
+
+               while (max_size)
+                       num_bits++, max_size /= 2;
+
+               log_assert(num_bits < 16);
+               config_bits.push_back(num_bits & 1 ? RTLIL::S1 : RTLIL::S0);
+               config_bits.push_back(num_bits & 2 ? RTLIL::S1 : RTLIL::S0);
+               config_bits.push_back(num_bits & 4 ? RTLIL::S1 : RTLIL::S0);
+               config_bits.push_back(num_bits & 8 ? RTLIL::S1 : RTLIL::S0);
+
+               for (auto &port : ports)
+               {
+                       if (SIZE(port.in_a) == 0)
+                               continue;
+
+                       config_bits.push_back(port.is_signed ? RTLIL::S1 : RTLIL::S0);
+                       config_bits.push_back(port.do_subtract ? RTLIL::S1 : RTLIL::S0);
+
+                       int size_a = SIZE(port.in_a);
+                       for (int i = 0; i < num_bits; i++)
+                               config_bits.push_back(size_a & (1 << i) ? RTLIL::S1 : RTLIL::S0);
+
+                       int size_b = SIZE(port.in_b);
+                       for (int i = 0; i < num_bits; i++)
+                               config_bits.push_back(size_b & (1 << i) ? RTLIL::S1 : RTLIL::S0);
+
+                       port_a.append(port.in_a);
+                       port_a.append(port.in_b);
+               }
+
+               cell->setPort("\\A", port_a);
+               cell->setPort("\\B", bit_ports);
+               cell->setParam("\\CONFIG", config_bits);
+               cell->setParam("\\CONFIG_WIDTH", SIZE(config_bits));
+               cell->setParam("\\A_WIDTH", SIZE(port_a));
+               cell->setParam("\\B_WIDTH", SIZE(bit_ports));
+       }
+
+       bool eval(RTLIL::Const &result) const
+       {
+               for (auto &bit : result.bits)
+                       bit = RTLIL::S0;
+
+               for (auto &port : ports)
+               {
+                       if (!port.in_a.is_fully_const() || !port.in_b.is_fully_const())
+                               return false;
+
+                       RTLIL::Const summand;
+                       if (SIZE(port.in_b) == 0)
+                               summand = const_pos(port.in_a.as_const(), port.in_b.as_const(), port.is_signed, port.is_signed, SIZE(result));
+                       else
+                               summand = const_mul(port.in_a.as_const(), port.in_b.as_const(), port.is_signed, port.is_signed, SIZE(result));
+
+                       if (port.do_subtract)
+                               result = const_sub(result, summand, port.is_signed, port.is_signed, SIZE(result));
+                       else
+                               result = const_add(result, summand, port.is_signed, port.is_signed, SIZE(result));
+               }
+
+               for (auto bit : bit_ports) {
+                       if (bit.wire)
+                               return false;
+                       result = const_add(result, bit.data, false, false, SIZE(result));
+               }
+
+               return true;
+       }
+};
+
+YOSYS_NAMESPACE_END
+
+#endif
index 08c79beaefe44d024551361f452ce6533849c4ee..97a2946a668d5c4fd24a71d79817ac9f1a962a50 100644 (file)
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/macc.h"
 #include "frontends/verilog/verilog_frontend.h"
 #include "backends/ilang/ilang_backend.h"
 
@@ -633,6 +634,17 @@ namespace {
                                return;
                        }
 
+                       if (cell->type == "$macc") {
+                               param("\\CONFIG");
+                               param("\\CONFIG_WIDTH");
+                               port("\\A", param("\\A_WIDTH"));
+                               port("\\B", param("\\B_WIDTH"));
+                               port("\\Y", param("\\Y_WIDTH"));
+                               check_expected();
+                               Macc().from_cell(cell);
+                               return;
+                       }
+
                        if (cell->type == "$logic_not") {
                                param_bool("\\A_SIGNED");
                                port("\\A", param("\\A_WIDTH"));
@@ -1781,7 +1793,7 @@ void RTLIL::Cell::fixup_parameters(bool set_a_signed, bool set_b_signed)
                return;
        }
 
-       bool signedness_ab = !type.in("$slice", "$concat");
+       bool signedness_ab = !type.in("$slice", "$concat", "$macc");
 
        if (connections_.count("\\A")) {
                if (signedness_ab) {
index 26aad43542611392b70acdf85e07e27b143869cd..96f08de4b49b41db3f91d3a532189618136b3bdb 100644 (file)
@@ -21,6 +21,7 @@
 #include "kernel/yosys.h"
 #include "kernel/satgen.h"
 #include "kernel/consteval.h"
+#include "kernel/macc.h"
 #include <algorithm>
 
 static uint32_t xorshift32_state = 123456789;
@@ -38,6 +39,53 @@ static void create_gold_module(RTLIL::Design *design, RTLIL::IdString cell_type,
        RTLIL::Cell *cell = module->addCell("\\UUT", cell_type);
        RTLIL::Wire *wire;
 
+       if (cell_type == "$macc")
+       {
+               Macc macc;
+               int width = 1 + xorshift32(16);
+               int depth = 1 + xorshift32(6);
+               int mulbits = 0;
+
+               RTLIL::Wire *wire_a = module->addWire("\\A");
+               wire_a->width = 0;
+               wire_a->port_input = true;
+
+               for (int i = 0; i < depth; i++)
+               {
+                       int size_a = xorshift32(width) + 1;
+                       int size_b = xorshift32(width) + 1;
+
+                       if (mulbits + size_a*size_b > 256 || xorshift32(2) == 1)
+                               size_b = 0;
+                       else
+                               mulbits += size_a*size_b;
+
+                       Macc::port_t this_port;
+
+                       wire_a->width += size_a;
+                       this_port.in_a = RTLIL::SigSpec(wire_a, wire_a->width - size_a, size_a);
+
+                       wire_a->width += size_b;
+                       this_port.in_b = RTLIL::SigSpec(wire_a, wire_a->width - size_b, size_b);
+
+                       this_port.is_signed = xorshift32(2) == 1;
+                       this_port.do_subtract = xorshift32(2) == 1;
+                       macc.ports.push_back(this_port);
+               }
+
+               wire = module->addWire("\\B");
+               wire->width = xorshift32(xorshift32(16)+1);
+               wire->port_input = true;
+               macc.bit_ports = wire;
+
+               wire = module->addWire("\\Y");
+               wire->width = width;
+               wire->port_output = true;
+               cell->setPort("\\Y", wire);
+
+               macc.to_cell(cell);
+       }
+
        if (cell_type == "$lut")
        {
                int width = 1 + xorshift32(6);
@@ -440,8 +488,10 @@ struct TestCellPass : public Pass {
                        break;
                }
 
-               if (xorshift32_state == 0)
-                       xorshift32_state = time(NULL);
+               if (xorshift32_state == 0) {
+                       xorshift32_state = time(NULL) & 0x7fffffff;
+                       log("Rng seed value: %d\n", int(xorshift32_state));
+               }
 
                std::map<std::string, std::string> cell_types;
                std::vector<std::string> selected_cell_types;
@@ -496,6 +546,7 @@ struct TestCellPass : public Pass {
 
                cell_types["$lut"] = "*";
                cell_types["$alu"] = "ABSY";
+               cell_types["$macc"] = "*";
 
                for (; argidx < SIZE(args); argidx++)
                {