Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion hw/top_chip/tmp_sim_cfg/rv_dm_base_sim_cfg.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
build_mode: "cover_reg_top"
run_opts: ["+csr_aliasing"]
en_run_modes: ["csr_tests_mode"]
reseed: 5
Comment thread
tchilikov-semify marked this conversation as resolved.
run_opts: ["+test_timeout_ns=100_000_000"]
}
{
Expand Down
26 changes: 10 additions & 16 deletions hw/vendor/lowrisc_ip.vendor.hjson
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
// Copyright lowRISC contributors.
// Licensed under the Apache License, Version 2.0, see LICENSE for details.
// SPDX-License-Identifier: Apache-2.0
//
// DD/RTL half of the lowRISC vendoring split. Shares its target_dir
// ("lowrisc_ip") with hw/vendor/lowrisc_ip_dv.vendor.hjson (the DV half).
// Run this DD vendor before the DV vendor: this run deletes each ip/<block>
// directory (including its dv/ subdir) before re-importing. See the DV config
// header for details.
{
name: "lowrisc_ip",
target_dir: "lowrisc_ip",
Expand Down Expand Up @@ -34,7 +40,7 @@
{from: "hw/ip/lc_ctrl", to: "ip/lc_ctrl"}, // Dependency of crossbar and power manager.
{from: "hw/ip/rom_ctrl", to: "ip/rom_ctrl", patch_dir: "rom_ctrl"}, // Read-only memory.
{from: "hw/ip/rv_core_ibex", to: "ip/rv_core_pkg", patch_dir: "rv_core_pkg"}, // RISC-V core package.
{from: "hw/ip/rv_timer", to: "ip/rv_timer", patch_dir: "rv_timer"}, // Timer.
{from: "hw/ip/rv_timer", to: "ip/rv_timer"}, // Timer.
Comment thread
tchilikov-semify marked this conversation as resolved.
{from: "hw/ip/spi_device", to: "ip/spi_device", patch_dir: "spi_device"}, // SPI device.
{from: "hw/ip/spi_host", to: "ip/spi_host", patch_dir: "spi_host"}, // SPI host.
{from: "hw/ip/tlul", to: "ip/tlul", patch_dir: "tlul"}, // Memory bus.
Expand All @@ -55,23 +61,11 @@

// Lint.
{from: "hw/lint", to: "lint", patch_dir: "lint"},

// Simulation.
{from: "hw/dv/dpi/gpiodpi", to: "dv/dpi/gpiodpi", patch_dir: "gpiodpi"},
{from: "hw/dv/dpi/spidpi", to: "dv/dpi/spidpi"},
{from: "hw/dv/dpi/uartdpi", to: "dv/dpi/uartdpi"},
{from: "hw/dv/dpi/jtagdpi", to: "dv/dpi/jtagdpi"},
{from: "hw/dv/dpi/common/tcp_server", to: "dv/dpi/common/tcp_server"},
{from: "hw/dv/sv", to: "dv/sv", patch_dir: "dv_sv"},
{from: "hw/dv/verilator", to: "dv/verilator", patch_dir: "dv_verilator"},

// Verification.
{from: "hw/dv/tools", to: "dv/tools", patch_dir: "dv_tools"},
{from: "hw/formal/tools", to: "formal/tools", patch_dir: "formal_tools"},
],

exclude_from_upstream: [
"*/BUILD",
"hw/dv/tools/vcs",
"**/BUILD",
"hw/ip/*/dv",
"hw/ip_templates/*/dv",
],
}
14 changes: 14 additions & 0 deletions hw/vendor/lowrisc_ip_dv.lock.hjson
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copyright lowRISC contributors (OpenTitan project).
// Licensed under the Apache License, Version 2.0, see LICENSE for details.
// SPDX-License-Identifier: Apache-2.0

// This file is generated by the util/vendor script. Please do not modify it
// manually.

{
upstream:
{
url: https://github.com/lowRISC/opentitan
rev: bf4a2b24e41742151cfce9c4041e959a3ba76ca3
}
}
63 changes: 63 additions & 0 deletions hw/vendor/lowrisc_ip_dv.vendor.hjson
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
// Copyright lowRISC contributors.
// Licensed under the Apache License, Version 2.0, see LICENSE for details.
// SPDX-License-Identifier: Apache-2.0
//
// DV half of the lowRISC vendoring split. This config shares its target_dir
// ("lowrisc_ip") with hw/vendor/lowrisc_ip.vendor.hjson (the DD/RTL half):
// the DD config vendors the RTL under ip/<block> and excludes */dv, while this
// config vendors only the DV subtrees. The two halves are pinned to
// independent upstream revisions via their separate lock files.
//
// Run order matters: vendor the DD config first, then this DV config. A DD run
// deletes each ip/<block> directory (including its dv/ subdir) before
// re-importing, so running the DD vendor after the DV vendor wipes the DV
// content until this DV vendor is re-run. util/artefacts.py runs both in this
// order before a single dirty-check.
{
name: "lowrisc_ip_dv",
target_dir: "lowrisc_ip",
patch_dir: "patches/lowrisc_ip",

upstream: {
url: "https://github.com/lowRISC/opentitan"
// Pinned revision of main branch
rev: "master"
}

mapping: [
// Shared DV infrastructure.
{from: "hw/dv/dpi/gpiodpi", to: "dv/dpi/gpiodpi", patch_dir: "gpiodpi"},
{from: "hw/dv/dpi/spidpi", to: "dv/dpi/spidpi"},
{from: "hw/dv/dpi/uartdpi", to: "dv/dpi/uartdpi"},
{from: "hw/dv/dpi/jtagdpi", to: "dv/dpi/jtagdpi"},
{from: "hw/dv/dpi/common/tcp_server", to: "dv/dpi/common/tcp_server"},
{from: "hw/dv/sv", to: "dv/sv", patch_dir: "dv_sv"},
{from: "hw/dv/verilator", to: "dv/verilator", patch_dir: "dv_verilator"},
{from: "hw/dv/tools", to: "dv/tools", patch_dir: "dv_tools"},
{from: "hw/formal/tools", to: "formal/tools", patch_dir: "formal_tools"},

// Per-IP DV environments.
{from: "hw/ip/entropy_src/dv", to: "ip/entropy_src/dv", patch_dir: "entropy_src_dv"},
{from: "hw/ip/i2c/dv", to: "ip/i2c/dv", patch_dir: "i2c_dv"},
{from: "hw/ip/kmac/dv", to: "ip/kmac/dv", patch_dir: "kmac_dv"},
{from: "hw/ip/lc_ctrl/dv", to: "ip/lc_ctrl/dv"},
{from: "hw/ip/prim/dv", to: "ip/prim/dv", patch_dir: "prim_dv"},
{from: "hw/ip/rom_ctrl/dv", to: "ip/rom_ctrl/dv", patch_dir: "rom_ctrl_dv"},
{from: "hw/ip/rv_timer/dv", to: "ip/rv_timer/dv", patch_dir: "rv_timer_dv"},
{from: "hw/ip/spi_device/dv", to: "ip/spi_device/dv", patch_dir: "spi_device_dv"},
{from: "hw/ip/spi_host/dv", to: "ip/spi_host/dv", patch_dir: "spi_host_dv"},
{from: "hw/ip/uart/dv", to: "ip/uart/dv", patch_dir: "uart_dv"},

// Per-IP-template DV environments.
{from: "hw/ip_templates/alert_handler/dv", to: "ip_templates/alert_handler/dv"},
{from: "hw/ip_templates/clkmgr/dv", to: "ip_templates/clkmgr/dv"},
{from: "hw/ip_templates/gpio/dv", to: "ip_templates/gpio/dv", patch_dir: "gpio_dv"},
{from: "hw/ip_templates/pwrmgr/dv", to: "ip_templates/pwrmgr/dv", patch_dir: "pwrmgr_dv"},
{from: "hw/ip_templates/rstmgr/dv", to: "ip_templates/rstmgr/dv", patch_dir: "rstmgr_dv"},
],

exclude_from_upstream: [
"**/BUILD",
"hw/dv/tools/vcs",
],
}
Loading