diff --git a/sim/midas b/sim/midas index aee6d33a..292aab91 160000 --- a/sim/midas +++ b/sim/midas @@ -1 +1 @@ -Subproject commit aee6d33a41cca65a9ebaa10245b9f5d443ecada8 +Subproject commit 292aab91a84970a8a78e4892a9db4c9502afafb8 diff --git a/sim/src/main/cc/firesim/firesim_top.cc b/sim/src/main/cc/firesim/firesim_top.cc index bc4f1201..471f6553 100644 --- a/sim/src/main/cc/firesim/firesim_top.cc +++ b/sim/src/main/cc/firesim/firesim_top.cc @@ -330,10 +330,10 @@ uint64_t host_mem_offset = -0x80000000LL; // There can only be one instance of assert and print widgets as their IO is // uniquely generated by a FIRRTL transform -#ifdef ASSERTIONWIDGET_struct_guard - #ifdef ASSERTIONWIDGET_0_PRESENT - ASSERTIONWIDGET_0_substruct_create; - add_endpoint(new synthesized_assertions_t(this, ASSERTIONWIDGET_0_substruct)); +#ifdef MIDASASSERTS_struct_guard + #ifdef MIDASASSERTS_PRESENT + MIDASASSERTS_substruct_create; + add_endpoint(new synthesized_assertions_t(this, MIDASASSERTS_substruct)); #endif #endif diff --git a/sim/src/main/cc/midasexamples/AssertModule.h b/sim/src/main/cc/midasexamples/AssertModule.h index f17c98f4..57d90c93 100644 --- a/sim/src/main/cc/midasexamples/AssertModule.h +++ b/sim/src/main/cc/midasexamples/AssertModule.h @@ -8,8 +8,8 @@ class AssertModule_t: virtual simif_t public: synthesized_assertions_t * assert_endpoint; AssertModule_t(int argc, char** argv) { - ASSERTIONWIDGET_0_substruct_create; - assert_endpoint = new synthesized_assertions_t(this, ASSERTIONWIDGET_0_substruct); + MIDASASSERTS_substruct_create; + assert_endpoint = new synthesized_assertions_t(this, MIDASASSERTS_substruct); }; void run() { int assertions_thrown = 0; diff --git a/sim/src/main/scala/midasexamples/Config.scala b/sim/src/main/scala/midasexamples/Config.scala index 2cd776f8..e8f82be4 100644 --- a/sim/src/main/scala/midasexamples/Config.scala +++ b/sim/src/main/scala/midasexamples/Config.scala @@ -11,7 +11,7 @@ class NoConfig extends Config(Parameters.empty) // This is incomplete and must be mixed into a complete platform config class DefaultF1Config extends Config(new Config((site, here, up) => { case firesim.util.DesiredHostFrequency => 75 - case SynthAsserts => false + case SynthAsserts => true case midas.GenerateMultiCycleRamModels => true case SynthPrints => false }) ++ new Config(new firesim.firesim.WithDefaultMemModel ++ new midas.F1Config))