Skip to content
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.

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

Introduce input sort #183

Open
wants to merge 126 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
08f3b5d
first commit
hibenj Apr 11, 2023
a87623c
Input_Sort updated
hibenj Apr 11, 2023
77ea3ec
Save coloring as it was
hibenj Apr 12, 2023
664f64c
coloring updated
hibenj Apr 12, 2023
f2ca6f1
Inerter balancing and tests
hibenj Apr 13, 2023
f45429a
updated coloring
hibenj Apr 13, 2023
4ee1a6f
Adjusted comments
hibenj Apr 14, 2023
0804779
Merge branch 'marcelwa:main' into Introduce_Input_Sort
hibenj Apr 14, 2023
7caa431
Merge branch 'marcelwa:main' into Introduce_Input_Sort
hibenj Apr 14, 2023
ea1f37c
Merge branch 'marcelwa:main' into Introduce_Input_Sort
hibenj Apr 14, 2023
86b3960
inverter_balancing files updated
hibenj Apr 20, 2023
06da497
input_ordering_view files updated
hibenj Apr 20, 2023
13ccb94
ortho_ordering_network files updated
hibenj Apr 20, 2023
35c255b
Merge branch 'Introduce_Input_Sort' of https://github.com/hibenj/fict…
hibenj Apr 20, 2023
54b2952
Merge branch 'marcelwa:main' into Introduce_Input_Sort
hibenj Apr 20, 2023
2168301
test formated
hibenj Apr 20, 2023
e9cc58e
updated cli command optimize with flag -i -> optimize inverters in gi…
hibenj Apr 20, 2023
31015b5
adjusted the cli command optimize to inverterbalance
hibenj Apr 20, 2023
ee47d56
CLI command adjusted
hibenj Apr 25, 2023
9d8ddb7
Comments adjusted
hibenj Apr 25, 2023
1b90258
Function more oversee-able
hibenj Apr 27, 2023
6ea65f5
Fixed clang warnings
hibenj Apr 27, 2023
3794d3e
Merge branch 'main' into Introduce_Input_Sort
hibenj Apr 27, 2023
3e0cc41
Fixed clang warnings
hibenj Apr 28, 2023
e1320b7
Merge remote-tracking branch 'origin/Introduce_Input_Sort' into Intro…
hibenj Apr 28, 2023
2fe8df2
Merge branch 'marcelwa:main' into Introduce_Input_Sort
hibenj May 2, 2023
58470dc
experiments_file
hibenj May 11, 2023
da91161
experiments for majority
hibenj May 15, 2023
8ac8bba
first commit
hibenj Apr 11, 2023
1190528
Input_Sort updated
hibenj Apr 11, 2023
6404537
Save coloring as it was
hibenj Apr 12, 2023
89c98a4
coloring updated
hibenj Apr 12, 2023
8292f39
Inerter balancing and tests
hibenj Apr 13, 2023
147870a
updated coloring
hibenj Apr 13, 2023
5fabf44
Adjusted comments
hibenj Apr 14, 2023
4e49d8d
inverter_balancing files updated
hibenj Apr 20, 2023
8ba9a4e
input_ordering_view files updated
hibenj Apr 20, 2023
469c302
ortho_ordering_network files updated
hibenj Apr 20, 2023
94d3612
test formated
hibenj Apr 20, 2023
1e9aeba
updated cli command optimize with flag -i -> optimize inverters in gi…
hibenj Apr 20, 2023
d2e496d
adjusted the cli command optimize to inverterbalance
hibenj Apr 20, 2023
36ae80d
CLI command adjusted
hibenj Apr 25, 2023
ad903c1
Comments adjusted
hibenj Apr 25, 2023
03a6a61
Function more oversee-able
hibenj Apr 27, 2023
ea9199e
Fixed clang warnings
hibenj Apr 27, 2023
f84162e
Fixed clang warnings
hibenj Apr 28, 2023
664d719
experiments_file
hibenj May 11, 2023
b2053dc
experiments for majority
hibenj May 15, 2023
4f92582
CLeaned files
hibenj May 25, 2023
9d28981
Merge remote-tracking branch 'origin/Introduce_Input_Sort' into Intro…
hibenj May 25, 2023
3a81819
Merge branch 'marcelwa:main' into Introduce_Input_Sort
hibenj May 25, 2023
ebfa154
CLeaned files
hibenj Jun 13, 2023
ffc8f08
Merge remote-tracking branch 'origin/Introduce_Input_Sort' into Intro…
hibenj Jun 13, 2023
6939dd7
CLeaned files
hibenj Jun 13, 2023
4f44e97
first commit
hibenj Apr 11, 2023
3c4ece5
Input_Sort updated
hibenj Apr 11, 2023
6708cd6
Save coloring as it was
hibenj Apr 12, 2023
b79e17a
coloring updated
hibenj Apr 12, 2023
5f10bb3
Inerter balancing and tests
hibenj Apr 13, 2023
61146fa
updated coloring
hibenj Apr 13, 2023
9c5b9d9
Adjusted comments
hibenj Apr 14, 2023
99f28f0
inverter_balancing files updated
hibenj Apr 20, 2023
53dcf41
input_ordering_view files updated
hibenj Apr 20, 2023
572cd2b
ortho_ordering_network files updated
hibenj Apr 20, 2023
38b9715
test formated
hibenj Apr 20, 2023
dca78fa
updated cli command optimize with flag -i -> optimize inverters in gi…
hibenj Apr 20, 2023
899a37a
adjusted the cli command optimize to inverterbalance
hibenj Apr 20, 2023
b516fad
CLI command adjusted
hibenj Apr 25, 2023
2663c94
Comments adjusted
hibenj Apr 25, 2023
c9a4f95
Function more oversee-able
hibenj Apr 27, 2023
b67856b
Fixed clang warnings
hibenj Apr 27, 2023
5a6f90b
Fixed clang warnings
hibenj Apr 28, 2023
92da3ef
experiments_file
hibenj May 11, 2023
7aed4e1
experiments for majority
hibenj May 15, 2023
2bc85d4
mockturtle update
hibenj May 25, 2023
bd0793b
Input_Sort updated
hibenj Apr 11, 2023
09eefe9
Inerter balancing and tests
hibenj Apr 13, 2023
4157b17
updated coloring
hibenj Apr 13, 2023
feb756f
Adjusted comments
hibenj Apr 14, 2023
1bf06eb
inverter_balancing files updated
hibenj Apr 20, 2023
556137a
input_ordering_view files updated
hibenj Apr 20, 2023
17a79b6
ortho_ordering_network files updated
hibenj Apr 20, 2023
883b3d4
test formated
hibenj Apr 20, 2023
fefb24f
updated cli command optimize with flag -i -> optimize inverters in gi…
hibenj Apr 20, 2023
d58c012
adjusted the cli command optimize to inverterbalance
hibenj Apr 20, 2023
c228ce7
CLI command adjusted
hibenj Apr 25, 2023
13c1fdc
Comments adjusted
hibenj Apr 25, 2023
63e8e46
Function more oversee-able
hibenj Apr 27, 2023
b2fb676
Fixed clang warnings
hibenj Apr 27, 2023
74659aa
Fixed clang warnings
hibenj Apr 28, 2023
87598d5
experiments_file
hibenj May 11, 2023
c3a31ed
experiments for majority
hibenj May 15, 2023
7fa3e3d
CLeaned files
hibenj Jun 13, 2023
b6ff14c
CLeaned files
hibenj Jun 13, 2023
fc496c1
Structured files
hibenj Jun 14, 2023
bb16be8
Merge remote-tracking branch 'origin/Introduce_Input_Sort' into Intro…
hibenj Jun 14, 2023
969ad68
New tests inverter substitution and readability ortho ordering
hibenj Jun 15, 2023
a2addd5
Experiments merged from fiction
hibenj Jun 15, 2023
b9a452e
Merge branch 'main' into Introduce_Input_Sort
hibenj Jun 15, 2023
fa95c22
Clang Format
hibenj Jun 15, 2023
db82419
Clang Format
hibenj Jun 15, 2023
2de6c33
flag is_input_ordered
hibenj Jun 19, 2023
eed2c32
Merge branch 'main' into Introduce_Input_Sort
hibenj Jun 19, 2023
6e64dda
Merge branch 'main' into Introduce_Input_Sort
hibenj Nov 21, 2023
ba8c4cf
Merge branch 'main' into Introduce_Input_Sort
hibenj Nov 21, 2023
172efde
Merge branch 'main' into Introduce_Input_Sort
hibenj Nov 21, 2023
9213096
Clang Format Linter
hibenj Nov 21, 2023
7cdba59
small changes: corrected data types, readability, corrected headers
hibenj Nov 21, 2023
23d2c4c
small changes: corrected data types, readability, corrected headers
hibenj Nov 21, 2023
68b1a23
Documentation error corrected
hibenj Nov 21, 2023
5887ecf
Documentation error corrected
hibenj Nov 21, 2023
063507e
Linter CI
hibenj Nov 21, 2023
0b1018c
Tests updated
hibenj Nov 22, 2023
628f3ee
Tests updated
hibenj Nov 22, 2023
8a53d00
Readability and test added
hibenj Nov 22, 2023
9e4e3d3
Merge branch 'cda-tum:main' into Introduce_Input_Sort
hibenj Nov 22, 2023
1f1d82d
CI run fix
hibenj Nov 23, 2023
facc1c1
CI run fix
hibenj Nov 23, 2023
ea4c056
Documentation and CLI commands updated
hibenj Nov 27, 2023
21308e8
Small changes to enable equivalence checking
hibenj Nov 28, 2023
02ca5bd
Small changes to enable equivalence checking
hibenj Nov 29, 2023
49293ee
Merge branch 'main' into Introduce_Input_Sort
marcelwa Dec 4, 2023
02229ba
Linter changes
hibenj Dec 4, 2023
d15d1b8
Merge remote-tracking branch 'origin/Introduce_Input_Sort' into Intro…
hibenj Dec 4, 2023
47d6741
Documentation updated
hibenj Dec 8, 2023
a2edcc4
Equivalence checking
hibenj Dec 10, 2023
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
Prev Previous commit
Next Next commit
experiments for majority
  • Loading branch information
hibenj committed May 24, 2023
commit b2053dce3f5f4627ea447833a459757fd58e683f
67 changes: 67 additions & 0 deletions test/utils/blueprints/network_blueprints.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,73 @@ mockturtle::names_view<Ntk> topolinano_network()
return ntk;
}

template <typename Ntk>
mockturtle::names_view<Ntk> par_check()
{
mockturtle::names_view<Ntk> ntk{};
const auto a = ntk.create_pi("a");
const auto b = ntk.create_pi("b");
const auto c = ntk.create_pi("c");
const auto p = ntk.create_pi("p");
const auto w1 = ntk.create_not(b);
const auto w2 = ntk.create_and(a, w1);
const auto w3 = ntk.create_not(a);
const auto w4 = ntk.create_and(w3, b);
const auto n1 = ntk.create_or(w2, w4);
const auto w5 = ntk.create_not(p);
const auto w6 = ntk.create_and(w5, c);
const auto w7 = ntk.create_not(a);
const auto w8 = ntk.create_and(w7, p);
const auto n2 = ntk.create_or(w6, w8);
const auto w9 = ntk.create_not(n2);
const auto w10 = ntk.create_and(n1, w9);
const auto w11 = ntk.create_not(n1);
const auto w12 = ntk.create_and(w11, n2);
const auto parity_check = ntk.create_or(w10, w12);

ntk.create_po(parity_check, "parity_check");

return ntk;
}

template <typename Ntk>
mockturtle::names_view<Ntk> fontes_1bitAdderMaj()
hibenj marked this conversation as resolved.
Show resolved Hide resolved
{
mockturtle::names_view<Ntk> ntk{};
const auto a = ntk.create_pi("a");
const auto b = ntk.create_pi("b");
const auto cin = ntk.create_pi("cin");
const auto new_n5 = ntk.create_and(a, b);
const auto new_n6 = ntk.create_and(a, cin);
const auto nnew_n5 = ntk.create_not(new_n5);
const auto nnew_n6 = ntk.create_not(new_n6);
const auto new_n7 = ntk.create_and(nnew_n5, nnew_n6);
const auto new_n8 = ntk.create_and(b, cin);
const auto nnew_n8 = ntk.create_not(new_n8);
const auto new_n9 = ntk.create_and(new_n7, nnew_n8);
const auto new_n10 = ntk.create_and(a, new_n9);
const auto new_n11 = ntk.create_and(b, new_n9);
const auto nnew_n10 = ntk.create_not(new_n10);
const auto nnew_n11 = ntk.create_not(new_n11);
const auto new_n12 = ntk.create_and(nnew_n10, nnew_n11);
const auto new_n13 = ntk.create_and(nnew_n5, new_n12);
const auto nnew_n9 = ntk.create_not(new_n9);
const auto nnew_n13 = ntk.create_not(new_n13);
const auto new_n14 = ntk.create_and(nnew_n9, nnew_n13);
const auto ncin = ntk.create_not(cin);
const auto new_n15 = ntk.create_and(ncin, nnew_n13);
const auto new_n16 = ntk.create_and(ncin, nnew_n9);
const auto nnew_n15 = ntk.create_not(new_n15);
const auto nnew_n16 = ntk.create_not(new_n16);
const auto new_n17 = ntk.create_and(nnew_n15, nnew_n16);
const auto nnew_n17 = ntk.create_not(new_n17);
const auto m3 = ntk.create_or(new_n14, nnew_n17);

ntk.create_po(m3, "m3");

return ntk;
}

} // namespace blueprints

#endif // FICTION_NETWORK_BLUEPRINTS_HPP