fix python lint, update golden

verilog-to-routing · Nov 11, 2023 · efe09e8 · efe09e8
1 parent f0f2ad5
commit efe09e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/vtr_flow/scripts/python_libs/vtr/util.py b/vtr_flow/scripts/python_libs/vtr/util.py
@@ -446,20 +446,20 @@ def format_elapsed_time(time_delta):
 }
 
 
-def argparse_use_previous(x: str) -> List[Tuple[str, List]]:
+def argparse_use_previous(inp: str) -> List[Tuple[str, List]]:
     """
     Parse a -use_previous parameter. Throw if not valid.
     Returns a list with (run dir name, [extension, cmdline option]) elements.
     """
-    tokens = [w.strip() for w in x.split(",")]
+    tokens = [w.strip() for w in inp.split(",")]
     tokens = [w for w in tokens if len(w)]
     out = []
     for w in tokens:
         r = re.fullmatch(r"(\w+):(\w+)", w)
         if not r:
-            raise argparse.ArgumentError("Invalid input to -use_previous: %s" % w)
+            raise argparse.ArgumentError(None, "Invalid input to -use_previous: %s" % w)
         if not REUSABLE_FILES.get(r.group(2)):
-            raise argparse.ArgumentError(
+            raise argparse.ArgumentError(None,
                 "Unknown file type to use_previous: %s, available types: %s"
                 % (r.group(2), ",".join(REUSABLE_FILES.keys()))
             )

diff --git a/...ion_tests/vtr_reg_nightly_test3/vtr_reg_qor_chain_predictor_off/config/golden_results.txt b/...ion_tests/vtr_reg_nightly_test3/vtr_reg_qor_chain_predictor_off/config/golden_results.txt
@@ -6,7 +6,7 @@
  k6_frac_N10_frac_chain_mem32K_40nm.xml	  ch_intrinsics.v	  common	  3.09	  vpr	  66.43 MiB	  	  -1	  -1	  0.28	  20908	  3	  0.08	  -1	  -1	  35908	  -1	  -1	  68	  99	  1	  0	  success	  222546b-dirty	  release IPO VTR_ASSERT_LEVEL=2	  GNU 9.5.0 on Linux-5.10.35-v8 x86_64	  2023-08-14T20:40:38	  gh-actions-runner-vtr-auto-spawned9	  /root/vtr-verilog-to-routing/vtr-verilog-to-routing	  68020	  99	  130	  343	  473	  1	  217	  298	  12	  12	  144	  clb	  auto	  28.0 MiB	  0.21	  528	  66.4 MiB	  0.22	  0.00	  1.48813	  -106.534	  -1.48813	  1.48813	  0.34	  0.000511155	  0.000455323	  0.0455192	  0.040659	  38	  1426	  9	  5.66058e+06	  4.21279e+06	  319126.	  2216.15	  0.69	  0.157488	  0.14284	  12802	  62767	  -1	  1200	  7	  370	  587	  33660	  11154	  0	  0	  33660	  11154	  587	  474	  0	  0	  1916	  1774	  0	  0	  2379	  1918	  0	  0	  658	  545	  0	  0	  13929	  3525	  0	  0	  14191	  2918	  0	  0	  587	  0	  0	  217	  290	  264	  2194	  0	  0	  2.05225	  2.05225	  -139.908	  -2.05225	  0	  0	  406307.	  2821.58	  0.12	  0.03	  0.06	  -1	  -1	  0.12	  0.0178615	  0.0169961	 
  k6_frac_N10_frac_chain_mem32K_40nm.xml	  diffeq1.v	  common	  9.95	  vpr	  69.80 MiB	  	  -1	  -1	  0.35	  24204	  5	  0.19	  -1	  -1	  37108	  -1	  -1	  31	  162	  0	  5	  success	  222546b-dirty	  release IPO VTR_ASSERT_LEVEL=2	  GNU 9.5.0 on Linux-5.10.35-v8 x86_64	  2023-08-14T20:40:38	  gh-actions-runner-vtr-auto-spawned9	  /root/vtr-verilog-to-routing/vtr-verilog-to-routing	  71480	  162	  96	  1070	  887	  1	  659	  294	  16	  16	  256	  mult_36	  auto	  31.9 MiB	  0.40	  4939	  69.8 MiB	  0.55	  0.01	  15.4576	  -1184.08	  -15.4576	  15.4576	  0.74	  0.00187443	  0.00169525	  0.18005	  0.162912	  62	  9853	  21	  1.21132e+07	  3.65071e+06	  968026.	  3781.35	  4.86	  0.702074	  0.645201	  28084	  189262	  -1	  8542	  19	  2956	  5015	  1761306	  459531	  0	  0	  1761306	  459531	  5015	  3878	  0	  0	  80537	  79477	  0	  0	  85315	  80914	  0	  0	  5540	  4332	  0	  0	  798473	  151211	  0	  0	  786426	  139719	  0	  0	  5015	  0	  0	  2076	  4948	  5050	  27147	  0	  0	  16.9804	  16.9804	  -1357.64	  -16.9804	  0	  0	  1.20332e+06	  4700.46	  0.40	  0.50	  0.19	  -1	  -1	  0.40	  0.111626	  0.105089	 
  k6_frac_N10_frac_chain_mem32K_40nm.xml	  diffeq2.v	  common	  33.73	  vpr	  68.45 MiB	  	  -1	  -1	  0.27	  23432	  5	  0.14	  -1	  -1	  36612	  -1	  -1	  22	  66	  0	  5	  success	  222546b-dirty	  release IPO VTR_ASSERT_LEVEL=2	  GNU 9.5.0 on Linux-5.10.35-v8 x86_64	  2023-08-14T20:40:38	  gh-actions-runner-vtr-auto-spawned9	  /root/vtr-verilog-to-routing/vtr-verilog-to-routing	  70088	  66	  96	  780	  597	  1	  469	  189	  16	  16	  256	  mult_36	  auto	  30.5 MiB	  0.51	  3526	  68.4 MiB	  0.35	  0.00	  11.6851	  -709.25	  -11.6851	  11.6851	  0.76	  0.00120113	  0.00107896	  0.119941	  0.108556	  50	  8655	  31	  1.21132e+07	  3.16567e+06	  780532.	  3048.95	  28.75	  0.876777	  0.806717	  26044	  153858	  -1	  7299	  23	  3640	  7699	  3274572	  895751	  0	  0	  3274572	  895751	  7699	  5644	  0	  0	  108363	  107363	  0	  0	  118945	  109348	  0	  0	  8390	  6354	  0	  0	  1540569	  339093	  0	  0	  1490606	  327949	  0	  0	  7699	  0	  0	  4068	  9496	  10334	  48753	  0	  0	  12.9547	  12.9547	  -837.03	  -12.9547	  0	  0	  1.00276e+06	  3917.05	  0.33	  0.82	  0.15	  -1	  -1	  0.33	  0.0925392	  0.0869791	 
- k6_frac_N10_frac_chain_mem32K_40nm.xml	  LU8PEEng.v	  common	  806.94	  vpr	  565.23 MiB	  	  -1	  -1	  55.99	  456792	  98	  93.44	  -1	  -1	  115000	  -1	  -1	  2126	  114	  45	  8	  success	  222546b-dirty	  release IPO VTR_ASSERT_LEVEL=2	  GNU 9.5.0 on Linux-5.10.35-v8 x86_64	  2023-08-14T20:40:38	  gh-actions-runner-vtr-auto-spawned9	  /root/vtr-verilog-to-routing/vtr-verilog-to-routing	  578792	  114	  102	  35713	  31804	  1	  16877	  2395	  56	  56	  3136	  clb	  auto	  345.3 MiB	  61.86	  225629	  557.1 MiB	  89.20	  0.72	  66.7728	  -53770.5	  -66.7728	  66.7728	  48.60	  0.0996187	  0.0881868	  12.5224	  10.3902	  92	  332277	  31	  1.8697e+08	  1.42409e+08	  1.91065e+07	  6092.62	  372.65	  49.6807	  40.8661	  432882	  4054463	  -1	  311004	  25	  73032	  282561	  38679351	  8148746	  0	  0	  38679351	  8148746	  275903	  99701	  0	  0	  716579	  649431	  0	  0	  895800	  722279	  0	  0	  287659	  112594	  0	  0	  18126773	  3286997	  0	  0	  18376637	  3277744	  0	  0	  275903	  0	  0	  209958	  938260	  944109	  6026482	  7028	  5966	  75.2225	  75.2225	  -68017	  -75.2225	  0	  0	  2.42931e+07	  7746.54	  11.02	  20.40	  4.30	  -1	  -1	  11.02	  6.90125	  5.91396	 
+k6_frac_N10_frac_chain_mem32K_40nm.xml	LU8PEEng.v	common	1024.32	vpr	583.37 MiB		-1	-1	68.76	456164	98	120.48	-1	-1	115016	-1	-1	2126	114	45	8	success	f0f2ad5-dirty	release IPO VTR_ASSERT_LEVEL=2	GNU 9.5.0 on Linux-5.10.35-v8 x86_64	2023-11-11T02:06:25	gh-actions-runner-vtr-auto-spawned30	/root/vtr-verilog-to-routing/vtr-verilog-to-routing	597368	114	102	35713	31804	1	16877	2395	56	56	3136	clb	auto	348.3 MiB	94.46	225629	1828333	682393	1114002	31938	555.8 MiB	105.63	0.84	66.7728	-53770.5	-66.7728	66.7728	56.79	0.135459	0.115272	17.051	13.7454	90	338247	34	1.8697e+08	1.42409e+08	1.87445e+07	5977.21	473.48	68.1463	54.4084	426610	3924124	-1	312213	22	69914	275085	38425627	8087296	0	0	38425627	8087296	267350	93882	0	0	730069	662093	0	0	905289	735847	0	0	278509	106077	0	0	17977454	3245056	0	0	18266956	3244341	0	0	267350	0	0	204831	940601	926855	5971273	8150	7176	75.429	75.429	-67708.4	-75.429	0	0	2.34582e+07	7480.28	15.77	24.35	5.71	-1	-1	15.77	8.58371	7.20655	
  k6_frac_N10_frac_chain_mem32K_40nm.xml	  LU32PEEng.v	  common	  5954.53	  vpr	  1.97 GiB	  	  -1	  -1	  182.33	  1458756	  97	  1043.59	  -1	  -1	  357600	  -1	  -1	  7412	  114	  168	  32	  success	  222546b-dirty	  release IPO VTR_ASSERT_LEVEL=2	  GNU 9.5.0 on Linux-5.10.35-v8 x86_64	  2023-08-14T20:40:38	  gh-actions-runner-vtr-auto-spawned9	  /root/vtr-verilog-to-routing/vtr-verilog-to-routing	  2061828	  114	  102	  120062	  107871	  1	  57253	  7828	  102	  102	  10404	  clb	  auto	  1116.5 MiB	  230.78	  1024166	  1829.3 MiB	  575.71	  2.33	  63.6041	  -357241	  -63.6041	  63.6041	  173.40	  0.2208	  0.177401	  49.3739	  40.6291	  130	  1343262	  22	  6.36957e+08	  5.04159e+08	  8.78147e+07	  8440.47	  3472.81	  121.701	  101.481	  1698928	  19170513	  -1	  1299597	  23	  214095	  922717	  229194662	  57115774	  0	  0	  229194662	  57115774	  872272	  270558	  0	  0	  2606432	  2375000	  0	  0	  3239454	  2622635	  0	  0	  906905	  325850	  0	  0	  109373388	  25250743	  0	  0	  112196211	  26270988	  0	  0	  872272	  0	  0	  683864	  3967323	  4013174	  22314130	  52223	  256845	  72.6361	  72.6361	  -480676	  -72.6361	  0	  0	  1.11251e+08	  10693.1	  44.68	  73.72	  13.64	  -1	  -1	  44.68	  13.519	  11.8459	 
  k6_frac_N10_frac_chain_mem32K_40nm.xml	  mcml.v	  common	  5590.95	  vpr	  2.30 GiB	  	  -1	  -1	  235.63	  1249788	  25	  3624.40	  -1	  -1	  371288	  -1	  -1	  6438	  36	  159	  27	  success	  222546b-dirty	  release IPO VTR_ASSERT_LEVEL=2	  GNU 9.5.0 on Linux-5.10.35-v8 x86_64	  2023-08-14T20:40:38	  gh-actions-runner-vtr-auto-spawned9	  /root/vtr-verilog-to-routing/vtr-verilog-to-routing	  2414304	  36	  356	  184794	  159441	  1	  63873	  7016	  95	  95	  9025	  clb	  auto	  1303.5 MiB	  106.45	  759866	  1800.6 MiB	  458.68	  2.74	  43.1973	  -293430	  -43.1973	  43.1973	  87.56	  0.162165	  0.136941	  27.0127	  21.5215	  150	  991300	  23	  5.4965e+08	  4.44764e+08	  8.67174e+07	  9608.58	  874.47	  114.986	  93.4965	  1599402	  19272762	  -1	  960330	  23	  216463	  491050	  99749431	  23324157	  0	  0	  99749431	  23324157	  431919	  248062	  0	  0	  1507217	  1376883	  0	  0	  1871350	  1514367	  0	  0	  443274	  267325	  0	  0	  47620972	  9863961	  0	  0	  47874699	  10053559	  0	  0	  431919	  0	  0	  218429	  1116681	  1069229	  3811885	  67265	  322642	  45.7678	  45.7678	  -355668	  -45.7678	  0	  0	  1.10186e+08	  12208.9	  45.15	  36.46	  14.41	  -1	  -1	  45.15	  12.1244	  10.6	 
  k6_frac_N10_frac_chain_mem32K_40nm.xml	  mkDelayWorker32B.v	  common	  105.57	  vpr	  316.11 MiB	  	  -1	  -1	  13.04	  120308	  5	  3.93	  -1	  -1	  47308	  -1	  -1	  464	  506	  44	  0	  success	  222546b-dirty	  release IPO VTR_ASSERT_LEVEL=2	  GNU 9.5.0 on Linux-5.10.35-v8 x86_64	  2023-08-14T20:40:38	  gh-actions-runner-vtr-auto-spawned9	  /root/vtr-verilog-to-routing/vtr-verilog-to-routing	  323696	  506	  553	  3236	  3734	  1	  2873	  1567	  50	  50	  2500	  memory	  auto	  58.8 MiB	  4.66	  16535	  316.1 MiB	  5.55	  0.06	  6.2106	  -2113.5	  -6.2106	  6.2106	  32.12	  0.0157696	  0.014233	  1.99122	  1.77569	  38	  25208	  14	  1.47946e+08	  4.91194e+07	  6.86579e+06	  2746.32	  22.31	  6.09096	  5.59345	  258216	  1426232	  -1	  24287	  16	  4346	  5518	  4596305	  1178705	  0	  0	  4596305	  1178705	  5223	  5115	  0	  0	  107347	  106107	  0	  0	  110686	  107981	  0	  0	  5567	  5288	  0	  0	  2173398	  469870	  0	  0	  2194084	  484344	  0	  0	  5223	  0	  0	  880	  7518	  4542	  11190	  300	  1122	  6.98529	  6.98529	  -2527.23	  -6.98529	  0	  0	  8.69102e+06	  3476.41	  4.48	  1.87	  1.37	  -1	  -1	  4.48	  0.75695	  0.714129