address PR review

- ER::Success for wait
- remove program flag and inclusion mechanism for now

Author: CheeksTheGeek

src/diag.cc

@@ -231,7 +231,7 @@ namespace diag {
 		engine.setMessage(ExpectStatementUnsupported, "expect statement will not be synthesized");
 		engine.setSeverity(ExpectStatementUnsupported, DiagnosticSeverity::Warning);
 
-		engine.setMessage(ProgramUnsupported, "program block will not be synthesized (use --ignore-programs=false to include)");
+		engine.setMessage(ProgramUnsupported, "program block will not be synthesized");
 		engine.setSeverity(ProgramUnsupported, DiagnosticSeverity::Warning);
 
 		engine.setMessage(ForbiddenDemotion, "disabling error '{}' is unsupported with yosys-slang");

src/initial_eval.cc

@@ -709,8 +709,7 @@ ER EvalVisitor::visit(const TimedStatement &stmt)
 ER EvalVisitor::visit(const slang::ast::WaitStatement &stmt)
 {
 	context.addDiag(slang_frontend::diag::WaitStatementUnsupported, stmt.sourceRange);
-	ER result = stmt.stmt.visit(*this);
-	return result;
+	return ER::Success;
 }
 
 ER EvalVisitor::visit(const EmptyStatement&)

src/slang_frontend.cc

@@ -51,8 +51,6 @@ void SynthesisSettings::addOptions(slang::CommandLine &cmdLine) {
 				"Ignore initial blocks for synthesis");
 	cmdLine.add("--ignore-assertions", ignore_assertions,
 				"Ignore assertions and formal statements in input");
-	cmdLine.add("--ignore-programs", ignore_programs,
-				"Ignore program blocks in input");
 	cmdLine.add("--unroll-limit", unroll_limit_,
 				"Set unrolling limit (default: 4000)", "<limit>");
 	// TODO: deprecate; now on by default
@@ -126,10 +124,6 @@ const RTLIL::IdString id(const std::string_view &view)
 
 static const RTLIL::IdString module_type_id(const ast::InstanceBodySymbol &sym)
 {
-	if (sym.getDefinition().definitionKind == ast::DefinitionKind::Program) {
-		return RTLIL::escape_id(std::string(sym.name) + "$program");
-	}
-
 	ast_invariant(sym, sym.parentInstance && sym.parentInstance->isModule());
 	std::string instance = sym.getHierarchicalPath();
 	if (instance == sym.name)
@@ -2092,13 +2086,13 @@ struct PopulateNetlist : public TimingPatternInterpretor, public ast::ASTVisitor
 
 				RTLIL::Cell *cell;
 				if (aloads.empty()) {
-					for (auto [named_chunk, name] : generate_subfield_names(driven_chunk, type)) {
-						cell = netlist.canvas->addDff(netlist.canvas->uniquify("$driver$" + RTLIL::unescape_id(netlist.id(*named_chunk.variable.get_symbol())) + name),
-												timing.triggers[0].signal,
-												assigned.extract(named_chunk.base - driven_chunk.base, named_chunk.bitwidth()),
-												netlist.convert_static(named_chunk),
-												timing.triggers[0].edge_polarity);
-						transfer_attrs(symbol, cell);
+						for (auto [named_chunk, name] : generate_subfield_names(driven_chunk, type)) {
+							cell = netlist.canvas->addDff(netlist.canvas->uniquify("$driver$" + RTLIL::unescape_id(netlist.id(*named_chunk.variable.get_symbol())) + name),
+													timing.triggers[0].signal,
+													assigned.extract(named_chunk.base - driven_chunk.base, named_chunk.bitwidth()),
+													netlist.convert_static(named_chunk),
+													timing.triggers[0].edge_polarity);
+							transfer_attrs(symbol, cell);
 					}
 				} else if (aloads.size() == 1) {
 					VariableBits aldff_q;
@@ -2241,10 +2235,8 @@ struct PopulateNetlist : public TimingPatternInterpretor, public ast::ASTVisitor
 	void handle(const ast::InstanceSymbol &sym)
 	{
 		if (sym.getDefinition().definitionKind == ast::DefinitionKind::Program) {
-			if (netlist.settings.ignore_programs.value_or(true)) {
-				return;
-			}
 			netlist.add_diag(diag::ProgramUnsupported, sym.location);
+			return;
 		}
 
 		// blackboxes get special handling no matter the hierarchy mode
@@ -3542,9 +3534,6 @@ struct SlangFrontend : Frontend {
 			HierarchyQueue hqueue;
 			for (auto instance : compilation->getRoot().topInstances) {
 				if (instance->getDefinition().definitionKind == ast::DefinitionKind::Program) {
-					if (settings.ignore_programs.value_or(true)) {
-						continue;
-					}
 					slang::Diagnostic program_diag(diag::ProgramUnsupported, instance->location);
 					driver.diagEngine.issue(program_diag);
 					continue;

src/slang_frontend.h

@@ -404,7 +404,6 @@ struct SynthesisSettings {
 	std::optional<bool> ignore_timing;
 	std::optional<bool> ignore_initial;
 	std::optional<bool> ignore_assertions;
-	std::optional<bool> ignore_programs;
 	std::optional<int> unroll_limit_;
 	std::optional<bool> extern_modules;
 	std::optional<bool> no_implicit_memories;