Update logformat and testcases

jenkins/test.sh

@@ -1,2 +1,3 @@
+set -e
 docker run -v $(pwd):/tritonmacroplace tritonmacroplace bash -c "/tritonmacroplace/test/regression fast"
 docker run -v $(pwd):/tritonmacroplace tritonmacroplace bash -c "cat /tritonmacroplace/test/results/diffs"

src/circuit.cpp

@@ -1485,7 +1485,7 @@ size_t TrimWhiteSpace(char *out, size_t len, const char *str)
 
 
 void MacroCircuit::ParseGlobalConfig(string fileName) {
-  cout << "Parsing globalConfig: " << fileName << " ... " ;
+//  cout << "Parsing globalConfig: " << fileName << " ... " ;
   std::ifstream gConfFile (fileName);
   if( !gConfFile.is_open() ) {
     cout << "ERROR: Cannot open file: " << fileName << endl;
@@ -1545,7 +1545,7 @@ void MacroCircuit::ParseGlobalConfig(string fileName) {
       exit(1);
     }
   }
-  cout << "Done!" << endl;
+//  cout << "Done!" << endl;
 }
 
 void MacroCircuit::ParseLocalConfig(string fileName) {

src/mPlace.cpp

@@ -57,7 +57,7 @@ void PrintAllSets(FILE* fp, CircuitInfo& cInfo,
 vector< vector<Partition> >
 PlaceMacros(EnvFile& env, Circuit::Circuit& ckt, MacroCircuit& mckt) {
 
-  env.Print(); 
+  //env.Print(); 
 
   cout << "PROC: LEF/DEF Parsing... ";
   ckt.Init(env.lefStor, env.def);

src/mPlaceExternal.cpp

@@ -77,7 +77,6 @@ void mplace_external::export_def(const char* def) {
 
   ckt.WriteDef( fp );
   fclose(fp);
-  cout << "INFO: " << def << " has beed exported!" << endl;
 }
 
 void mplace_external::export_all_def(const char* location) { 
@@ -131,7 +130,6 @@ void mplace_external::export_all_def(const char* location) {
     ckt.WriteDef( fp );
     fclose(fp);
     
-    cout << "INFO: " << fileName << " has beed exported!" << endl;
     solCount++;
   }
 }

test/gcd-mem1-test-01.ok

@@ -1,34 +1,6 @@
 MacroPlacer Version: 1.0.0
-Liberty: 
-nangate45-bench/tech/NangateOpenCellLibrary_typical.lib
-nangate45-bench/tech/fakeram45_64x7.lib
-
-Verilog: 
-nangate45-bench/design/gcd_mem1/gcd_mem1.v
-
-
-Sdc: 
-nangate45-bench/design/gcd_mem1/gcd_mem1.sdc
-
-Lef: 
-nangate45-bench/tech/fakeram45_64x7.lef
-nangate45-bench/tech/NangateOpenCellLibrary.lef
-
-Def: 
-nangate45-bench/design/gcd_mem1/gcd_mem1.def
-
-Search Depth: 
-3
-
-globalConfig: 
-nangate45-bench/design/gcd_mem1/halo_0.5.cfg
-
-localConfig: 
-
-
 PROC: LEF/DEF Parsing... Done!
 
-Parsing globalConfig: nangate45-bench/design/gcd_mem1/halo_0.5.cfg ... Done!
 Extracting Macro Cells... Done!
 Extracted # Macros: 1
 OpenSTA 2.0.17 2fe5cfafa2 Copyright (c) 2019, Parallax Software, Inc.
@@ -90,7 +62,6 @@ INFO: Total Extracted Sets = 2
 
 Parquet is starting... Done
 Set 1: WWL = 0
-INFO: /home/mgwoo/02_macroPlace/git/TritonMacroPlace/test/results/gcd-mem1-test-01-mplace.def has beed exported!
 PossibleSol : 1
 VERSION 5.8 ;
 DIVIDERCHAR "/" ;

test/gcd-mem1-test-01.tcl

@@ -5,20 +5,15 @@ set designDir nangate45-bench/design/${design}
 
 mplace_external mp
 
-# mp import_lef $techDir/NangateOpenCellLibrary.lef
-set lefList [glob -directory ${techDir} *.lef]
-foreach lef $lefList {
-  mp import_lef $lef
-}
+mp import_lef ${techDir}/NangateOpenCellLibrary.lef
+mp import_lef ${techDir}/fakeram45_64x7.lef
 
 mp import_def ${designDir}/${design}.def
 mp import_verilog ${designDir}/${design}.v
 mp import_sdc ${designDir}/${design}.sdc
 
-set libList [glob -directory ${techDir} *.lib]
-foreach lib $libList {
-  mp import_lib $lib
-}
+mp import_lib ${techDir}/NangateOpenCellLibrary_typical.lib
+mp import_lib ${techDir}/fakeram45_64x7.lib
 
 mp import_global_config ${designDir}/halo_0.5.cfg
 mp place_macros

test/gcd-mem1-test-02.ok

@@ -1,34 +1,6 @@
 MacroPlacer Version: 1.0.0
-Liberty: 
-nangate45-bench/tech/NangateOpenCellLibrary_typical.lib
-nangate45-bench/tech/fakeram45_64x7.lib
-
-Verilog: 
-nangate45-bench/design/gcd_mem1/gcd_mem1.v
-
-
-Sdc: 
-nangate45-bench/design/gcd_mem1/gcd_mem1.sdc
-
-Lef: 
-nangate45-bench/tech/fakeram45_64x7.lef
-nangate45-bench/tech/NangateOpenCellLibrary.lef
-
-Def: 
-nangate45-bench/design/gcd_mem1/gcd_mem1.def
-
-Search Depth: 
-3
-
-globalConfig: 
-nangate45-bench/design/gcd_mem1/halo_1.0.cfg
-
-localConfig: 
-
-
 PROC: LEF/DEF Parsing... Done!
 
-Parsing globalConfig: nangate45-bench/design/gcd_mem1/halo_1.0.cfg ... Done!
 Extracting Macro Cells... Done!
 Extracted # Macros: 1
 OpenSTA 2.0.17 2fe5cfafa2 Copyright (c) 2019, Parallax Software, Inc.
@@ -90,7 +62,6 @@ INFO: Total Extracted Sets = 2
 
 Parquet is starting... Done
 Set 1: WWL = 0
-INFO: /home/mgwoo/02_macroPlace/git/TritonMacroPlace/test/results/gcd-mem1-test-02-mplace.def has beed exported!
 PossibleSol : 1
 VERSION 5.8 ;
 DIVIDERCHAR "/" ;

test/gcd-mem1-test-02.tcl

@@ -5,26 +5,22 @@ set designDir nangate45-bench/design/${design}
 
 mplace_external mp
 
-# mp import_lef $techDir/NangateOpenCellLibrary.lef
-set lefList [glob -directory ${techDir} *.lef]
-foreach lef $lefList {
-  mp import_lef $lef
-}
+mp import_lef ${techDir}/NangateOpenCellLibrary.lef
+mp import_lef ${techDir}/fakeram45_64x7.lef
 
 mp import_def ${designDir}/${design}.def
 mp import_verilog ${designDir}/${design}.v
 mp import_sdc ${designDir}/${design}.sdc
 
-set libList [glob -directory ${techDir} *.lib]
-foreach lib $libList {
-  mp import_lib $lib
-}
+mp import_lib ${techDir}/NangateOpenCellLibrary_typical.lib
+mp import_lib ${techDir}/fakeram45_64x7.lib
 
 mp import_global_config ${designDir}/halo_1.0.cfg
 mp place_macros
 
 set def_file [make_result_file "gcd-mem1-test-02-mplace.def"]
 mp export_def $def_file
+
 puts "PossibleSol : [mp get_solution_count]"
 report_file $def_file