Skip to content

Commit

Permalink
[CLEANUP/REFACTOR] Moves, renames and refactors
Browse files Browse the repository at this point in the history
These things were bothering me as I went along, so this commit captures my many
WIP fixes. In particular, try to use pathlib instead of strings where possible,
and give variables more descriptive names. Also add typehints.

Signed-off-by: Harry Callahan <[email protected]>
  • Loading branch information
hcallahan-lowrisc committed Aug 17, 2024
1 parent d09e282 commit fe89c99
Show file tree
Hide file tree
Showing 5 changed files with 171 additions and 116 deletions.
15 changes: 4 additions & 11 deletions hw/data/common_project_cfg.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
// Licensed under the Apache License, Version 2.0, see LICENSE for details.
// SPDX-License-Identifier: Apache-2.0
{
project: opentitan
repo_server: "github.com/lowrisc/opentitan"
book: opentitan.org/book
doc_server: docs.opentitan.org
results_server: reports.opentitan.org
project: opentitan
repo_server: "github.com/lowrisc/opentitan"
book: opentitan.org/book
results_server_fqdn: reports.opentitan.org

// Default directory structure for the output
scratch_base_path: "{scratch_root}/{branch}"
Expand All @@ -23,12 +22,6 @@
{ proj_root: "{proj_root}" }
]

// Results server stuff - indicate what command to use to copy over the results.
// Workaround for gsutil to fall back to using python2.7.
results_server_prefix: "gs://"
results_server_cmd: "/usr/bin/gsutil"
results_html_name: "report.html"

// If defined, this is printed into the results md files
revision: '''{eval_cmd}
COMMIT_L=`git rev-parse HEAD`; \
Expand Down
8 changes: 3 additions & 5 deletions hw/vendor/lowrisc_ibex/dv/uvm/common_project_cfg.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
// Licensed under the Apache License, Version 2.0, see LICENSE for details.
// SPDX-License-Identifier: Apache-2.0
{
project: ibex
project: ibex

// These keys are expected by dvsim.py, so we have to set them to something.
book: bogus.book.domain
doc_server: bogus.doc.server
results_server: bogus.results.server
results_html_name: report.html
book: bogus.book.domain
results_server_fqdn: bogus.results.server

// Default directory structure for the output
scratch_base_path: "{scratch_root}/{dut}.{flow}.{tool}"
Expand Down
Loading

0 comments on commit fe89c99

Please sign in to comment.