Merge pull request #813 from os-fpga/pln_trace_option

pln: enable --trace <number> CL option, overrides pln_trace variable

Author: serge-dsa

planning/src/RS/rsCheck.cpp

@@ -15,7 +15,7 @@ bool do_check_blif(CStr cfn) {
   BLIF_file bfile(string{cfn});
 
   if (tr >= 4)
-    bfile.setTrace(3);
+    bfile.setTrace(tr);
 
   bool exi = false;
   exi = bfile.fileExists();

planning/src/RS/rsOpts.cpp

@@ -40,7 +40,7 @@ static CStr _output_[] = {"OU", "ou", "out", "outp", "output", nullptr};
 
 static CStr _assOrd_[] = {"ASS", "ass", "assign", "assign_unconstrained", "assign_unconstrained_pins", nullptr};
 
-static CStr _trace_[] = {"TR", "trace", "tr", "tra", nullptr};
+static CStr _trace_[] = {"TR", "T", "TT", "tt", "trace", "Trace", "Tr", "tr", "tra", "trac", nullptr};
 
 static CStr _test_[] = {"TE", "TC", "test", "te", "tc", "tes", "tst", "test_case", "test_c", nullptr};
 
@@ -156,6 +156,7 @@ void rsOpts::printHelp() const noexcept {
   static CStr tab1[] = {
     "--help,-H", "Help",
     "--version,-V", "Version",
+    "--trace,-T <number>", "Trace level, default 3",
     "--check <blif_file_name>", "BLIF or EBLIF file to check",
     "--csv <csv_file_name>", "CSV file (pin table) to check",
     nullptr, nullptr, nullptr };

planning/src/RS/rsOpts.h

@@ -92,11 +92,12 @@ struct rsOpts {
   void printHelp() const noexcept;
 
   bool unit_specified() const noexcept {
-    return unit1_ || unit2_ || unit3_ || unit4_ || unit5_ || unit6_ || unit7_;
+    return unit1_ or unit2_ or unit3_ or unit4_ or unit5_ or unit6_
+           or unit7_;
   }
-  bool ver_or_help() const noexcept { return version_ || det_ver_ || help_; }
+  bool ver_or_help() const noexcept { return version_ or det_ver_ or help_; }
 
-  bool trace_specified() const noexcept { return traceIndex_ > 0; }
+  bool trace_specified() const noexcept { return traceIndex_ > 0 and trace_ > 0; }
   bool test_id_specified() const noexcept { return test_id_ > 0; }
 
   bool set_STA_testCase(int TC_id) noexcept;

planning/src/main.cpp

@@ -1,4 +1,4 @@
-static const char* _pln_VERSION_STR = "pln0318";
+static const char* _pln_VERSION_STR = "pln0319";
 
 #include "RS/rsEnv.h"
 #include "util/pln_log.h"
@@ -449,27 +449,29 @@ int main(int argc, char** argv) {
   using std::string;
 
   rsOpts& opts = s_env.opts_;
-  const char* trace = getenv("pln_trace");
+  const char* trace = ::getenv("pln_trace");
   if (trace)
-    set_ltrace(atoi(trace));
+    set_ltrace(::atoi(trace));
   else
-    set_ltrace(opts.trace_);
+    set_ltrace(3);
 
   cout << s_env.traceMarker_ << endl;
 
   s_env.initVersions(_pln_VERSION_STR);
 
   s_env.parse(argc, argv);
+  if (opts.trace_specified())
+    set_ltrace(opts.trace_);
 
-  if (opts.trace_ >= 8 || ltrace() >= 9 || getenv("pln_trace_env")) {
+  if (opts.trace_ >= 8 or ltrace() >= 9 or ::getenv("pln_trace_env")) {
     s_env.dump("\n----env----\n");
     lout() << "-----------" << endl;
   }
 
   if (opts.ver_or_help()) {
     if (ltrace() >= 2) {
       printf("\t %s\n", _pln_VERSION_STR);
-      printf("\t compiled:  %s\n", s_env.compTimeCS());
+      printf("\t compiled:    %s\n", s_env.compTimeCS());
     }
     deal_help(opts);
     pln::flush_out();