Reorganize topgen_matcha scripts 1. Rename hw/matcha/util/topgen to hw/matcha/util/topgen_matcha 2. Put gen_dv.py inside topgen_matcha Change-Id: I83c521ed73d271376b10da3d2642a74dd4e78bc4

diff --git a/util/topgen_matcha.py b/util/topgen_matcha.py
index 3e5e63e..4080820 100755
--- a/util/topgen_matcha.py
+++ b/util/topgen_matcha.py

@@ -36,7 +36,7 @@
 from topgen import merge_top, search_ips, validate_top
 from topgen.c_test import TopGenCTest
 from topgen.clocks import Clocks
-from gen_dv_matcha import gen_dv
+from topgen_matcha.gen_dv import gen_dv
 from topgen.gen_top_docs import gen_top_docs
 from topgen.merge import connect_clocks, create_alert_lpgs, extract_clocks
 from topgen.resets import Resets
@@ -68,7 +68,7 @@
 
 TOPGEN_TEMPLATE_PATH = OPENTITAN_TOP / "util/topgen/templates"
 
-TOPGEN_TEMPLATE_MATCHA_PATH = Path(__file__).parent / "topgen/templates"
+TOPGEN_TEMPLATE_MATCHA_PATH = Path(__file__).parent / "topgen_matcha/templates"
 
 
 def is_intr_to_smc(module):

diff --git a/util/topgen_matcha/__init__.py b/util/topgen_matcha/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/util/topgen_matcha/__init__.py


diff --git a/util/gen_dv_matcha.py b/util/topgen_matcha/gen_dv.py
similarity index 95%
rename from util/gen_dv_matcha.py
rename to util/topgen_matcha/gen_dv.py
index d08dc20..189829d 100755
--- a/util/gen_dv_matcha.py
+++ b/util/topgen_matcha/gen_dv.py

@@ -1,3 +1,4 @@
+# Copyright 2022 Google LLC
 # Copyright lowRISC contributors.
 # Licensed under the Apache License, Version 2.0, see LICENSE for details.
 # SPDX-License-Identifier: Apache-2.0
@@ -26,7 +27,7 @@
            matcha_root: str) -> int:
     '''Generate DV RAL model for a Top'''
     # Read template
-    lookup = TemplateLookup(directories=[os.path.join(matcha_root, "util/topgen"),
+    lookup = TemplateLookup(directories=[os.path.join(matcha_root, "util/topgen_matcha"),
                                          resource_filename('reggen', '.')])
     uvm_reg_tpl = lookup.get_template('top_uvm_reg.sv.tpl')
 

diff --git a/util/topgen/templates/README.md b/util/topgen_matcha/templates/README.md
similarity index 100%
rename from util/topgen/templates/README.md
rename to util/topgen_matcha/templates/README.md


diff --git a/util/topgen/templates/chiplevel.sv.tpl b/util/topgen_matcha/templates/chiplevel.sv.tpl
similarity index 100%
rename from util/topgen/templates/chiplevel.sv.tpl
rename to util/topgen_matcha/templates/chiplevel.sv.tpl


diff --git a/util/topgen/templates/plic_all_irqs_test.c.tpl b/util/topgen_matcha/templates/plic_all_irqs_test.c.tpl
similarity index 100%
rename from util/topgen/templates/plic_all_irqs_test.c.tpl
rename to util/topgen_matcha/templates/plic_all_irqs_test.c.tpl


diff --git a/util/topgen/templates/tb__xbar_connect.sv.tpl b/util/topgen_matcha/templates/tb__xbar_connect.sv.tpl
similarity index 100%
rename from util/topgen/templates/tb__xbar_connect.sv.tpl
rename to util/topgen_matcha/templates/tb__xbar_connect.sv.tpl


diff --git a/util/topgen/templates/toplevel.c.tpl b/util/topgen_matcha/templates/toplevel.c.tpl
similarity index 100%
rename from util/topgen/templates/toplevel.c.tpl
rename to util/topgen_matcha/templates/toplevel.c.tpl


diff --git a/util/topgen/templates/toplevel.h.tpl b/util/topgen_matcha/templates/toplevel.h.tpl
similarity index 100%
rename from util/topgen/templates/toplevel.h.tpl
rename to util/topgen_matcha/templates/toplevel.h.tpl


diff --git a/util/topgen/templates/toplevel.sv.tpl b/util/topgen_matcha/templates/toplevel.sv.tpl
similarity index 100%
rename from util/topgen/templates/toplevel.sv.tpl
rename to util/topgen_matcha/templates/toplevel.sv.tpl


diff --git a/util/topgen/top_uvm_reg.sv.tpl b/util/topgen_matcha/top_uvm_reg.sv.tpl
similarity index 100%
rename from util/topgen/top_uvm_reg.sv.tpl
rename to util/topgen_matcha/top_uvm_reg.sv.tpl