Skip to content

Fix #270 #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 18, 2020
Merged

Fix #270 #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cd9decb
(Re-)add test cases for Akers.
msoeken Mar 17, 2020
3762f4a
fix eq cec of quality test (akers)
eletesta Apr 9, 2020
911c4d5
Merge branch 'master' into lsils/akers-fix
eletesta Apr 11, 2020
b0c1182
akers and cut rewriting
eletesta Apr 11, 2020
e79b8c7
Merge branch 'master' into lsils/akers-fix
eletesta Apr 14, 2020
e019c0f
Merge branch 'master' into lsils/akers-fix
eletesta Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions include/mockturtle/algorithms/akers_synthesis.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include <vector>

#include <kitty/bit_operations.hpp>
#include <kitty/constructors.hpp>
#include <kitty/cube.hpp>
#include <kitty/dynamic_truth_table.hpp>

Expand Down Expand Up @@ -634,6 +635,9 @@ class akers_synthesis_impl
table.reduce();
}

if ( ntk.node_to_index( ntk.get_node( c_to_f[last_gate_id] ) ) == 0 )
return ntk.get_constant( 0 ^ ntk.is_complemented( c_to_f[last_gate_id] ) );

return c_to_f[last_gate_id];
}

Expand Down Expand Up @@ -807,6 +811,31 @@ signal<Ntk> akers_synthesis( Ntk& ntk, kitty::dynamic_truth_table const& func, k
assert( func.num_vars() == care.num_vars() );
assert( std::distance( begin, end ) == func.num_vars() );

auto pi = begin;

if ( is_const0( func ) )
return ntk.get_constant( 0 );
auto tt_1 = func;
unary_not( tt_1 );
if ( is_const0( tt_1 ) )
return ntk.get_constant( 1 );

tt_1 = func;
for ( auto i = 0; i < func.num_vars(); i++ )
{
create_nth_var( tt_1, i );
auto it = *pi++;
if ( tt_1 == func )
{
return it;
}
unary_not( tt_1 );
if ( tt_1 == func )
{
return !it;
}
}

detail::akers_synthesis_impl<Ntk, LeavesIterator> tt( ntk, func, care, begin, end );
return tt.run();
}
Expand Down
284 changes: 284 additions & 0 deletions test/algorithms/akers_synthesis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,284 @@
#include <catch.hpp>

#include <kitty/constructors.hpp>
#include <kitty/dynamic_truth_table.hpp>
#include <kitty/operations.hpp>
#include <kitty/print.hpp>

#include <mockturtle/algorithms/akers_synthesis.hpp>
#include <mockturtle/networks/mig.hpp>
#include <mockturtle/networks/xmg.hpp>

using namespace mockturtle;

TEST_CASE( "Check Akers for MAJ-3", "[akers_synthesis]" )
{
std::vector<kitty::dynamic_truth_table> xs{5, kitty::dynamic_truth_table( 3 )};

create_majority( xs[0] );
for ( auto i = 0u; i < unsigned( xs[0].num_bits() ); i++ )
{
set_bit( xs[1], i );
}

auto mig = akers_synthesis<mig_network>( xs[0], xs[1] );

kitty::create_nth_var( xs[2], 0 );
kitty::create_nth_var( xs[3], 1 );
kitty::create_nth_var( xs[4], 2 );

CHECK( mig.compute( mig.index_to_node( mig.size() - 1 ), xs.begin() + 2, xs.end() ) == xs[0] );
CHECK( mig.size() == 5 );
}

TEST_CASE( "Check Akers for MAJ-5", "[akers_synthesis]" )
{
std::vector<kitty::dynamic_truth_table> xs{7, kitty::dynamic_truth_table( 5 )};

create_majority( xs[0] );
for ( auto i = 0u; i < unsigned( xs[0].num_bits() ); i++ )
{
set_bit( xs[1], i );
}

auto mig = akers_synthesis<mig_network>( xs[0], xs[1] );

kitty::create_nth_var( xs[2], 0 );
kitty::create_nth_var( xs[3], 1 );
kitty::create_nth_var( xs[4], 2 );
kitty::create_nth_var( xs[5], 3 );
kitty::create_nth_var( xs[6], 4 );

mig.foreach_gate( [&]( auto n ) {
std::vector<kitty::dynamic_truth_table> fanin{3, kitty::dynamic_truth_table( 5 )};
mig.foreach_fanin( n, [&]( auto s, auto j ) {
fanin[j] = xs[mig.node_to_index( mig.get_node( s ) ) + 1];
} );
xs.push_back( mig.compute( n, fanin.begin(), fanin.end() ) );
} );
CHECK( xs[xs.size() - 1] == xs[0] );
}

TEST_CASE( "Check Akers for MAJ-5 in XMG", "[akers_synthesis]" )
{
std::vector<kitty::dynamic_truth_table> xs{7, kitty::dynamic_truth_table( 5 )};

create_majority( xs[0] );
for ( auto i = 0u; i < unsigned( xs[0].num_bits() ); i++ )
{
set_bit( xs[1], i );
}

auto xmg = akers_synthesis<xmg_network>( xs[0], xs[1] );

kitty::create_nth_var( xs[2], 0 );
kitty::create_nth_var( xs[3], 1 );
kitty::create_nth_var( xs[4], 2 );
kitty::create_nth_var( xs[5], 3 );
kitty::create_nth_var( xs[6], 4 );

xmg.foreach_gate( [&]( auto n ) {
std::vector<kitty::dynamic_truth_table> fanin{3, kitty::dynamic_truth_table( 5 )};
xmg.foreach_fanin( n, [&]( auto s, auto j ) {
fanin[j] = xs[xmg.node_to_index( xmg.get_node( s ) ) + 1];
} );
xs.push_back( xmg.compute( n, fanin.begin(), fanin.end() ) );
} );
CHECK( xs[xs.size() - 1] == xs[0] );
}

TEST_CASE( "Check Akers for random - 4 inputs", "[akers_synthesis]" )
{
for ( auto y = 0; y < 5; y++ )
{
std::vector<kitty::dynamic_truth_table> xs{6, kitty::dynamic_truth_table( 4 )};
kitty::create_nth_var( xs[2], 0 );
kitty::create_nth_var( xs[3], 1 );
kitty::create_nth_var( xs[4], 2 );
kitty::create_nth_var( xs[5], 3 );

create_random( xs[0] );

for ( auto i = 0u; i < unsigned( xs[0].num_bits() ); i++ )
{
set_bit( xs[1], i );
}

auto mig = akers_synthesis<mig_network>( xs[0], xs[1] );
if ( mig.size() > 4 )
{
mig.foreach_gate( [&]( auto n ) {
std::vector<kitty::dynamic_truth_table> fanin{3, kitty::dynamic_truth_table( 4 )};
mig.foreach_fanin( n, [&]( auto s, auto j ) {
if ( mig.node_to_index( mig.get_node( s ) ) == 0 )
{
fanin[j] = ~xs[1];
}
else
{
fanin[j] = xs[mig.node_to_index( mig.get_node( s ) ) + 1];
}
} );
xs.push_back( mig.compute( n, fanin.begin(), fanin.end() ) );
} );

mig.foreach_po( [&]( auto n ) {
if ( mig.is_complemented( n ) )
CHECK( ~xs[xs.size() - 1] == xs[0] );
else
CHECK( xs[xs.size() - 1] == xs[0] );
} );
}
}
}

TEST_CASE( "Check Akers for random - 5 inputs", "[akers_synthesis]" )
{
for ( auto y = 0; y < 5; y++ )
{
std::vector<kitty::dynamic_truth_table> xs{7, kitty::dynamic_truth_table( 5 )};
kitty::create_nth_var( xs[2], 0 );
kitty::create_nth_var( xs[3], 1 );
kitty::create_nth_var( xs[4], 2 );
kitty::create_nth_var( xs[5], 3 );
kitty::create_nth_var( xs[6], 4 );

create_random( xs[0] );

for ( auto i = 0u; i < unsigned( xs[0].num_bits() ); i++ )
{
set_bit( xs[1], i );
}

auto mig = akers_synthesis<mig_network>( xs[0], xs[1] );
if ( mig.size() > 6 )
{
mig.foreach_gate( [&]( auto n ) {
std::vector<kitty::dynamic_truth_table> fanin{3, kitty::dynamic_truth_table( 5 )};
mig.foreach_fanin( n, [&]( auto s, auto j ) {
if ( mig.node_to_index( mig.get_node( s ) ) == 0 )
{
fanin[j] = ~xs[1];
}
else
{
fanin[j] = xs[mig.node_to_index( mig.get_node( s ) ) + 1];
}
} );
xs.push_back( mig.compute( n, fanin.begin(), fanin.end() ) );
} );

mig.foreach_po( [&]( auto n ) {
if ( mig.is_complemented( n ) )
CHECK( ~xs[xs.size() - 1] == xs[0] );
else
CHECK( xs[xs.size() - 1] == xs[0] );
} );
}
}
}

TEST_CASE( "Check Akers for random - 6 inputs", "[akers_synthesis]" )
{
for ( auto y = 0; y < 1; y++ )
{
std::vector<kitty::dynamic_truth_table> xs{8, kitty::dynamic_truth_table( 6 )};
kitty::create_nth_var( xs[2], 0 );
kitty::create_nth_var( xs[3], 1 );
kitty::create_nth_var( xs[4], 2 );
kitty::create_nth_var( xs[5], 3 );
kitty::create_nth_var( xs[6], 4 );
kitty::create_nth_var( xs[7], 5 );

create_random( xs[0] );

for ( auto i = 0u; i < unsigned( xs[0].num_bits() ); i++ )
{
set_bit( xs[1], i );
}

auto mig = akers_synthesis<mig_network>( xs[0], xs[1] );
if ( mig.size() > 6 )
{
mig.foreach_gate( [&]( auto n ) {
std::vector<kitty::dynamic_truth_table> fanin{3, kitty::dynamic_truth_table( 6 )};
mig.foreach_fanin( n, [&]( auto s, auto j ) {
if ( mig.node_to_index( mig.get_node( s ) ) == 0 )
{
fanin[j] = ~xs[1];
}
else
{
fanin[j] = xs[mig.node_to_index( mig.get_node( s ) ) + 1];
}
} );
xs.push_back( mig.compute( n, fanin.begin(), fanin.end() ) );
} );
mig.foreach_po( [&]( auto n ) {
if ( mig.is_complemented( n ) )
CHECK( ~xs[xs.size() - 1] == xs[0] );
else
CHECK( xs[xs.size() - 1] == xs[0] );
} );
}
}
}

TEST_CASE( "Check leaves iterator -- easy case ", "[akers_synthesis]" )
{
mig_network mig;
auto a = mig.create_pi();
auto b = mig.create_pi();
auto c = mig.create_pi();
auto d = mig.create_pi();

std::vector<mig_network::signal> operations;
operations.push_back( mig.create_and( a, b ) );
operations.push_back( mig.create_and( c, d ) );

std::vector<kitty::dynamic_truth_table> xs_in{2, kitty::dynamic_truth_table( 2 )};
std::vector<kitty::dynamic_truth_table> xs{5, kitty::dynamic_truth_table( 4 )};
create_from_binary_string( xs_in[0], "0110" );
for ( auto i = 0u; i < unsigned( xs_in[0].num_bits() ); i++ )
{
set_bit( xs_in[1], i );
}
auto t = akers_synthesis( mig, xs_in[0], xs_in[1], operations.begin(), operations.end() );
mig.create_po( t );

kitty::create_nth_var( xs[1], 0 );
kitty::create_nth_var( xs[2], 1 );
kitty::create_nth_var( xs[3], 2 );
kitty::create_nth_var( xs[4], 3 );

for ( auto i = 0u; i < unsigned( xs[1].num_bits() ); i++ )
{
set_bit( xs[0], i );
}

CHECK( mig.num_gates() == 5 );

if ( mig.size() > 6 )
{
mig.foreach_gate( [&]( auto n ) {
std::vector<kitty::dynamic_truth_table> fanin{3, kitty::dynamic_truth_table( 4 )};
mig.foreach_fanin( n, [&]( auto s, auto j ) {
if ( mig.node_to_index( mig.get_node( s ) ) == 0 )
{
fanin[j] = ~xs[0];
}
else
{
fanin[j] = xs[mig.get_node( s )];
}
} );
xs.push_back( mig.compute( n, fanin.begin(), fanin.end() ) );
} );
mig.foreach_po( [&]( auto n ) {
if ( mig.is_complemented( n ) )
CHECK( ~xs[xs.size() - 1] == binary_xor( binary_and( xs[1], xs[2] ), binary_and( xs[4], xs[3] ) ) );
else
CHECK( xs[xs.size() - 1] == binary_xor( binary_and( xs[1], xs[2] ), binary_and( xs[4], xs[3] ) ) );
} );
}
}
22 changes: 22 additions & 0 deletions test/algorithms/cut_rewriting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include <catch.hpp>

#include <mockturtle/algorithms/cut_rewriting.hpp>
#include <mockturtle/algorithms/node_resynthesis/akers.hpp>
#include <mockturtle/algorithms/node_resynthesis/exact.hpp>
#include <mockturtle/algorithms/node_resynthesis/mig_npn.hpp>
#include <mockturtle/algorithms/node_resynthesis/xag_minmc2.hpp>
Expand Down Expand Up @@ -59,6 +60,27 @@ TEST_CASE( "In-place cut rewriting with XMG3 4-input npn database", "[cut_rewrit
CHECK( xmg.num_gates() == 1 );
}

TEST_CASE( "Cut rewriting with Akers synthesis", "[cut_rewriting]" )
{
mig_network mig;
const auto a = mig.create_pi();
const auto b = mig.create_pi();
const auto c = mig.create_pi();

const auto f = mig.create_maj( a, mig.create_maj( a, b, c ), c );
mig.create_po( f );

akers_resynthesis<mig_network> resyn;
cut_rewriting_with_compatibility_graph( mig, resyn );

mig = cleanup_dangling( mig );

CHECK( mig.size() == 5 );
CHECK( mig.num_pis() == 3 );
CHECK( mig.num_pos() == 1 );
CHECK( mig.num_gates() == 1 );
}

TEST_CASE( "In-place cut rewriting from constant", "[cut_rewriting]" )
{
mig_network mig;
Expand Down
Loading