rcx: honor deprecated ext_model_file option in Ext::extract

Signed-off-by: Arthur Koucher <arthurkoucher@precisioninno.com>

Author: AcKoucher

src/rcx/src/OpenRCX.tcl

@@ -83,13 +83,7 @@ proc extract_parasitics { args } {
 
   set ext_model_file ""
   if { [info exists keys(-ext_model_file)] } {
-    utl::warn RCX 514 "The -ext_model_file option is deprecated. Use\
-                       set_extraction_rules_file command instead."
-
-    # We may have multiple technologies loaded, so use the current block's
-    # tech to prevent an error resolving an ambiguous default tech.
-    set tech [[ord::get_db_block] getTech]
-    set_extraction_rules_file -tech [$tech getName] $keys(-ext_model_file)
+    set ext_model_file $keys(-ext_model_file)
   }
 
   set corner_cnt 1

src/rcx/src/ext.cpp

@@ -216,7 +216,17 @@ void Ext::extract(ExtractOptions options)
 
   odb::orderWires(logger_, block);
 
-  std::string rules_file = block->getTech()->getExtractionRulesFile();
+  odb::dbTech* tech = block->getTech();
+  if (options.ext_model_file != nullptr && options.ext_model_file[0] != '\0') {
+    logger_->warn(RCX,
+                  514,
+                  "The ext_model_file option is deprecated. Use "
+                  "set_extraction_rules_file command instead.");
+
+    tech->setExtractionRulesFile(options.ext_model_file);
+  }
+
+  std::string rules_file = tech->getExtractionRulesFile();
   if (!rules_file.empty()) {
     options.ext_model_file = rules_file.c_str();
   }

src/rcx/test/rcx_aux.py

@@ -1,4 +1,3 @@
-import utl
 import rcx
 
 # Thin wrapper over api defined in ext.i (and reused by ext-py.i)
@@ -28,21 +27,11 @@ def extract_parasitics(
     dbg=0
 ):
 
-    if ext_model_file is not None:
-        utl.warn(
-            utl.RCX,
-            514,
-            "The ext_model_file option is deprecated. Use "
-            "set_extraction_rules_file command instead.",
-        )
-
-        # We may have multiple technologies loaded, so use the current block's
-        # tech to prevent an error resolving an ambiguous default tech.
-        db_tech = design.getBlock().getTech()
-        db_tech.setExtractionRulesFile(ext_model_file)
-
     opts = rcx.ExtractOptions()
 
+    if ext_model_file is not None:
+        opts.ext_model_file = ext_model_file
+
     opts.corner_cnt = corner_cnt
     opts.corner = corner
     opts.max_res = max_res