Merge pull request #250 from abs-tudelft/fix-clock-assignments

Fix clock assignments

Author: Johan Peltenburg

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR)
 
 project(fletcher)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 
 option(FLETCHER_BUILD_FLETCHGEN "Build fletchgen" OFF)
 option(FLETCHER_BUILD_ECHO "Build echo platform library" OFF)

codegen/cpp/fletchgen/CMakeLists.txt

@@ -29,6 +29,7 @@ if(NOT cerata_POPULATED)
   set(BUILD_CERATA_TESTS OFF CACHE BOOL "")
   set(BUILD_CERATA_DOT ON CACHE BOOL "")
   set(BUILD_CERATA_VHDL ON CACHE BOOL "")
+  set(BUILD_CERATA_YAML ON CACHE BOOL "")
   add_subdirectory(${cerata_SOURCE_DIR} ${cerata_BINARY_DIR})
 endif()
 

codegen/cpp/fletchgen/src/fletchgen/array.cc

@@ -15,6 +15,7 @@
 #include "fletchgen/array.h"
 
 #include <cerata/api.h>
+#include <cerata/vhdl/vhdl.h>
 #include <fletcher/common.h>
 #include <utility>
 #include <memory>

codegen/cpp/fletchgen/src/fletchgen/basic_types.cc

@@ -15,6 +15,7 @@
 #include "fletchgen/basic_types.h"
 
 #include <cerata/api.h>
+#include <cerata/vhdl/vhdl.h>
 #include <fletcher/common.h>
 
 #include <memory>
@@ -73,6 +74,7 @@ std::shared_ptr<Type> cr() {
   static std::shared_ptr<Type> result = record("cr", {
       field("clk", bit()),
       field("reset", bit())});
+  result->meta[cerata::vhdl::meta::NO_INSERT_SIGNAL] = "true";
   return result;
 }
 

codegen/cpp/fletchgen/src/fletchgen/bus.cc

@@ -15,6 +15,7 @@
 #include "fletchgen/bus.h"
 
 #include <cerata/api.h>
+#include <cerata/vhdl/vhdl.h>
 
 #include <memory>
 #include <vector>

codegen/cpp/fletchgen/src/fletchgen/design.cc

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include <cerata/api.h>
+#include <cerata/vhdl/vhdl.h>
 
 #include <string>
 #include <vector>

codegen/cpp/fletchgen/src/fletchgen/fletchgen.cc

@@ -15,6 +15,8 @@
 #include "fletchgen/fletchgen.h"
 
 #include <cerata/api.h>
+#include <cerata/dot/dot.h>
+#include <cerata/vhdl/vhdl.h>
 #include <fletcher/common.h>
 
 #include <fstream>

codegen/cpp/fletchgen/src/fletchgen/mmio.cc

@@ -17,6 +17,7 @@
 #include <fletcher/fletcher.h>
 #include <fletcher/common.h>
 #include <cerata/api.h>
+#include <cerata/vhdl/vhdl.h>
 #include <memory>
 #include <string>
 #include <fstream>

codegen/cpp/fletchgen/src/fletchgen/nucleus.cc

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "fletchgen/nucleus.h"
-
 #include <cerata/api.h>
+#include <cerata/vhdl/vhdl.h>
 #include <vector>
 #include <string>
 #include <cerata/parameter.h>
 
+#include "fletchgen/nucleus.h"
 #include "fletchgen/basic_types.h"
 #include "fletchgen/recordbatch.h"
 #include "fletchgen/kernel.h"

codegen/cpp/fletchgen/src/fletchgen/profiler.cc

@@ -15,6 +15,7 @@
 #include "fletchgen/profiler.h"
 
 #include <cerata/api.h>
+#include <cerata/vhdl/vhdl.h>
 #include <cmath>
 #include <memory>
 #include <vector>