Merge pull request #5386 from YosysHQ/emil/liberty-glob-all

widlarizer · web-flow · commit 9a12d9255109 · 2025-10-09T20:21:48.000+02:00
Expand wildcards in Liberty file consumers
diff --git a/kernel/io.cc b/kernel/io.cc
@@ -384,6 +384,13 @@ std::string escape_filename_spaces(const std::string& filename)
 	return out;
 }
 
+void append_globbed(std::vector<std::string>& paths, std::string pattern)
+{
+	rewrite_filename(pattern);
+	std::vector<std::string> globbed = glob_filename(pattern);
+	copy(globbed.begin(), globbed.end(), back_inserter(paths));
+}
+
 void format_emit_unescaped(std::string &result, std::string_view fmt)
 {
 	result.reserve(result.size() + fmt.size());
diff --git a/kernel/io.h b/kernel/io.h
@@ -469,6 +469,7 @@ bool is_absolute_path(std::string filename);
 void remove_directory(std::string dirname);
 bool create_directory(const std::string& dirname);
 std::string escape_filename_spaces(const std::string& filename);
+void append_globbed(std::vector<std::string>& paths, std::string pattern);
 
 YOSYS_NAMESPACE_END
 
diff --git a/passes/techmap/clockgate.cc b/passes/techmap/clockgate.cc
@@ -290,9 +290,7 @@ struct ClockgatePass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-liberty" && argidx+1 < args.size()) {
-				std::string liberty_file = args[++argidx];
-				rewrite_filename(liberty_file);
-				liberty_files.push_back(liberty_file);
+				append_globbed(liberty_files, args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-dont_use" && argidx+1 < args.size()) {
diff --git a/passes/techmap/dfflibmap.cc b/passes/techmap/dfflibmap.cc
@@ -609,9 +609,7 @@ struct DfflibmapPass : public Pass {
 		{
 			std::string arg = args[argidx];
 			if (arg == "-liberty" && argidx+1 < args.size()) {
-				std::string liberty_file = args[++argidx];
-				rewrite_filename(liberty_file);
-				liberty_files.push_back(liberty_file);
+				append_globbed(liberty_files, args[++argidx]);
 				continue;
 			}
 			if (arg == "-prepare") {
diff --git a/passes/techmap/libcache.cc b/passes/techmap/libcache.cc
@@ -96,9 +96,7 @@
 				quiet = true;
 				continue;
 			}
-			std::string fname = args[argidx];
-			rewrite_filename(fname);
-			paths.push_back(fname);
+			append_globbed(paths, args[argidx]);
 			break;
 		}
 		int modes = enable + disable + purge + list + verbose + quiet;
diff --git a/tests/liberty/libcache.ys b/tests/liberty/libcache.ys
@@ -1,5 +1,5 @@
 libcache -verbose
-libcache -enable busdef.lib
+libcache -enable bus*f.lib
 
 logger -expect log "Caching is disabled by default." 1
 logger -expect log "Caching is enabled for `busdef.lib'." 1
diff --git a/tests/techmap/clockgate.ys b/tests/techmap/clockgate.ys
@@ -194,7 +194,7 @@ select -assert-count 1 t:\\pdk_icg
 #------------------------------------------------------------------------------
 
 design -load before
-clockgate -liberty clockgate.lib
+clockgate -liberty c*ckgate.lib
 
 # rising edge ICGs
 select -module dffe_00 -assert-count 0 t:\\pos_small
diff --git a/tests/techmap/dfflibmap.ys b/tests/techmap/dfflibmap.ys
@@ -23,7 +23,7 @@ read_liberty -lib dfflibmap.lib
 equiv_opt -map dfflibmap-sim.v -assert -multiclock dfflibmap -liberty dfflibmap.lib
 equiv_opt -map dfflibmap-sim.v -assert -multiclock dfflibmap -prepare -liberty dfflibmap.lib
 
-dfflibmap -prepare -liberty dfflibmap.lib
+dfflibmap -prepare -liberty dffl*bmap.lib
 equiv_opt -map dfflibmap-sim.v -assert -multiclock dfflibmap -map-only -liberty dfflibmap.lib
 
 design -load orig

Original file line number	Diff line number	Diff line change
`@@ -384,6 +384,13 @@ std::string escape_filename_spaces(const std::string& filename)`
`384`	`384`	`return out;`
`385`	`385`	`}`
`386`	`386`
	`387`	`+void append_globbed(std::vector<std::string>& paths, std::string pattern)`
	`388`	`+{`
	`389`	`+ rewrite_filename(pattern);`
	`390`	`+ std::vector<std::string> globbed = glob_filename(pattern);`
	`391`	`+ copy(globbed.begin(), globbed.end(), back_inserter(paths));`
	`392`	`+}`
	`393`	`+`
`387`	`394`	`void format_emit_unescaped(std::string &result, std::string_view fmt)`
`388`	`395`	`{`
`389`	`396`	`result.reserve(result.size() + fmt.size());`
Original file line number	Diff line number	Diff line change
`@@ -290,9 +290,7 @@ struct ClockgatePass : public Pass {`
`290`	`290`	`continue;`
`291`	`291`	`}`
`292`	`292`	`if (args[argidx] == "-liberty" && argidx+1 < args.size()) {`
`293`		`- std::string liberty_file = args[++argidx];`
`294`		`- rewrite_filename(liberty_file);`
`295`		`- liberty_files.push_back(liberty_file);`
	`293`	`+ append_globbed(liberty_files, args[++argidx]);`
`296`	`294`	`continue;`
`297`	`295`	`}`
`298`	`296`	`if (args[argidx] == "-dont_use" && argidx+1 < args.size()) {`
Original file line number	Diff line number	Diff line change
`@@ -609,9 +609,7 @@ struct DfflibmapPass : public Pass {`
`609`	`609`	`{`
`610`	`610`	`std::string arg = args[argidx];`
`611`	`611`	`if (arg == "-liberty" && argidx+1 < args.size()) {`
`612`		`- std::string liberty_file = args[++argidx];`
`613`		`- rewrite_filename(liberty_file);`
`614`		`- liberty_files.push_back(liberty_file);`
	`612`	`+ append_globbed(liberty_files, args[++argidx]);`
`615`	`613`	`continue;`
`616`	`614`	`}`
`617`	`615`	`if (arg == "-prepare") {`
Original file line number	Diff line number	Diff line change
`@@ -96,9 +96,7 @@`
`96`	`96`	`quiet = true;`
`97`	`97`	`continue;`
`98`	`98`	`}`
`99`		`- std::string fname = args[argidx];`
`100`		`- rewrite_filename(fname);`
`101`		`- paths.push_back(fname);`
	`99`	`+ append_globbed(paths, args[argidx]);`
`102`	`100`	`break;`
`103`	`101`	`}`
`104`	`102`	`int modes = enable + disable + purge + list + verbose + quiet;`