Merge branch 'master' into secure-yosys0.50

Author: eder-matheus

flow/designs/asap7/aes-block/autotuner.json

@@ -24,14 +24,6 @@
         ],
         "step": 0
     },
-    "CORE_MARGIN": {
-        "type": "int",
-        "minmax": [
-            2,
-            2
-        ],
-        "step": 0
-    },
     "CELL_PAD_IN_SITES_GLOBAL_PLACEMENT": {
         "type": "int",
         "minmax": [

flow/designs/asap7/aes/autotuner.json

@@ -24,14 +24,6 @@
         ],
         "step": 0
     },
-    "CORE_MARGIN": {
-        "type": "int",
-        "minmax": [
-            2,
-            2
-        ],
-        "step": 0
-    },
     "CELL_PAD_IN_SITES_GLOBAL_PLACEMENT": {
         "type": "int",
         "minmax": [
@@ -64,14 +56,6 @@
         ],
         "step": 0
     },
-    "_PINS_DISTANCE": {
-        "type": "int",
-        "minmax": [
-            1,
-            1
-        ],
-        "step": 1
-    },
    "CTS_CLUSTER_SIZE": {
         "type": "int",
         "minmax": [

flow/designs/asap7/ibex/autotuner.json

@@ -24,14 +24,6 @@
         ],
         "step": 0
     },
-    "CORE_MARGIN": {
-        "type": "int",
-        "minmax": [
-            2,
-            2
-        ],
-        "step": 0
-    },
     "CELL_PAD_IN_SITES_GLOBAL_PLACEMENT": {
         "type": "int",
         "minmax": [
@@ -64,14 +56,6 @@
         ],
         "step": 0
     },
-    "_PINS_DISTANCE": {
-        "type": "int",
-        "minmax": [
-            1,
-            1
-        ],
-        "step": 1
-    },
     "CTS_CLUSTER_SIZE": {
         "type": "int",
         "minmax": [

flow/util/genMetrics.py

@@ -82,10 +82,8 @@ def extractTagFromFile(
     if jsonTag in jsonFile:
         print("[WARN] Overwriting Tag", jsonTag)
 
-    # Open file
     try:
-        searchFilePath = file
-        with open(searchFilePath) as f:
+        with open(file) as f:
             content = f.read()
 
         parsedMetrics = re.findall(pattern, content, re.M)
@@ -110,12 +108,12 @@ def extractTagFromFile(
         else:
             # Only print a warning if the defaultNotFound is not set
             print(
-                "[WARN] Tag {} not found in {}.".format(jsonTag, searchFilePath),
+                "[WARN] Tag {} not found in {}.".format(jsonTag, file),
                 "Will use {}.".format(defaultNotFound),
             )
             jsonFile[jsonTag] = defaultNotFound
     except IOError:
-        print("[ERROR] Failed to open file:", searchFilePath)
+        print("[ERROR] Failed to open file:", file)
         jsonFile[jsonTag] = "ERR"