diff --git a/include/Match.h b/include/Match.h index 0212bd7..2debfb7 100644 --- a/include/Match.h +++ b/include/Match.h @@ -239,7 +239,7 @@ int Match::getMatch(string dir) match(i); vector dirs = splits(dir, "/"); string outdir = "result/" + dirs[1] + "/" + dirs[2] + ".out"; - cout << outdir << endl; + //cout << outdir << endl; FILE *out; out = fopen(outdir.c_str(), "w"); for (int i = 1; i <= n; i++) diff --git a/source/ABC.cpp b/source/ABC.cpp index 23a3c72..62c8890 100644 --- a/source/ABC.cpp +++ b/source/ABC.cpp @@ -52,6 +52,7 @@ void abc_map(string in_file, string write_cmd, string out_file, string lib) { command += "map;"; // area-only mapping command += write_cmd + " " + out_file + ";"; execute_command(command); + cout << "Standard cell mapping done!" << endl; } void abc_lutpack(string in_file, string write_cmd, string out_file, string lib) { @@ -68,4 +69,5 @@ void abc_lutpack(string in_file, string write_cmd, string out_file, string lib) // } command += write_cmd + " " + out_file + ";"; execute_command(command); + cout << "LUT packing done!" << endl; } diff --git a/source/Circuit.cpp b/source/Circuit.cpp index 5b1302c..bd1626c 100644 --- a/source/Circuit.cpp +++ b/source/Circuit.cpp @@ -36,6 +36,8 @@ Circuit::Circuit(string benchmark_) standard_cell_map("ALL.genlib"); + cout << "PI = " << input.size() << ", PO = " << output.size() << ", size = " << graph.size() << endl; + abc_res = get_abc_result(); // for (auto p : graph) { @@ -209,9 +211,7 @@ pair > Circuit::get_abc_result() { int r1 = abc_lut_area; int r2 = abc_lut_area - mt->getMatch(benchmark + "_abc_lut.blif"); int r3 = mt->maxdep; - cout << "ABC Area1: " << r1 << endl; - cout << "ABC Area2: " << r2 << endl; - cout << "ABC dep" << " " << r3 << endl; + cout << "ABC single_area = " << r1 << ", dual_area = " << r2 << ", depth = " << r3 << endl; return make_pair(r1, make_pair(r2, r3)); } diff --git a/source/MAIN.cpp b/source/MAIN.cpp index 38758c1..f9955cb 100644 --- a/source/MAIN.cpp +++ b/source/MAIN.cpp @@ -144,7 +144,7 @@ pair Output(Circuit &c) { } fprintf(out1, "%s\n", ("\noutput:\n" + now).c_str()); } - fprintf(stdout, "Area: %d\nDepth: %d\n", area, dep); + fprintf(stdout, "DOLM single_area = %d, single_depth = %d\n", area, dep); c.Dep = dep; return make_pair(area, dep); } @@ -245,7 +245,7 @@ pair Output2(Circuit &c) { } } } - fprintf(stdout, "Area: %d\nDepth: %d\n", area, c.Dep); + fprintf(stdout, "DOLM dual_area = %d, dual_depth = %d\n", area, c.Dep); return make_pair(area, c.Dep); } @@ -554,7 +554,7 @@ int main(int argc, char *argv[]) { clock_t finish = clock(); total_time = (double) (finish - start) / CLOCKS_PER_SEC; - cout << "Run time: " << total_time << "s" << endl; + cout << "Run time = " << total_time << "s" << endl; } fout.close(); return 0;