Skip to content

Commit

Permalink
treewide: Various cleanup passes
Browse files Browse the repository at this point in the history
* Consistent headers

* Rename and relocate various files

* Update README and CHANGELOG

* Add linting pass to ensure consistent headers
  • Loading branch information
thommythomaso committed Nov 1, 2023
1 parent e3cd418 commit 1d724c6
Show file tree
Hide file tree
Showing 85 changed files with 377 additions and 160 deletions.
45 changes: 45 additions & 0 deletions .github/authors-cfg.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Copyright 2023 ETH Zurich and University of Bologna.
# Solderpad Hardware License, Version 0.51, see LICENSE for details.
# SPDX-License-Identifier: SHL-0.51

# Authors:
# - Thomas Benz <tbenz@iis.ee.ethz.ch>

header-regex: >
(?:#\!/.*\n)*[/|#]+ Copyright ([0-9]+) ETH Zurich and University of Bologna\.\n[/|#]+ Solderpad Hardware License, Version 0\.51, see LICENSE for details\.\n[/|#]+ SPDX-License-Identifier: SHL-0\.51\n\n[/|#]+ Authors:\n((?:[/#]+ - [0-9A-Za-z ]+<[0-9A-Za-z\.]+@[0-9A-Za-z\.]+>\n)+)
author-regex: >
([0-9A-Za-z ]+)<([0-9A-Za-z\.]+@[0-9A-Za-z\.]+)>
excludes:
- LICENSE
- VERSION
- CODEOWNERS
- doc/fig/iDMA_overview
- util/lint-commits.py
- test/future/idma_tb_per2axi.sv
- test/future/TLToAXI4.v

exclude-ext:
- png
- pyc
- rst
- svg
- txt
- json
- md
- lock
- local

exclude-paths:
- target

allowed-years:
- 2023

allowed-authors:
Axel Vanoni: axvanoni@ethz.ch
Michael Rogenmoser: michaero@iis.ee.ethz.ch
Samuel Riedel: sriedel@iis.ee.ethz.ch
Thomas Benz: tbenz@iis.ee.ethz.ch
Tobias Senti: tsenti@ethz.ch
19 changes: 19 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,22 @@ jobs:
-
name: Lint commits
run: python3 util/lint-commits.py HEAD

lint-author:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v3
-
name: Install Python
uses: actions/setup-python@v4
with:
python-version: '3.9'
cache: 'pip'
-
name: Python Requirements
run: pip install -r requirements.txt
-
name: Lint authors
run: python3 util/lint-authors.py .github/authors-cfg.yaml
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 ETH Zurich and University of Bologna.
# Copyright 2023 ETH Zurich and University of Bologna.
# Solderpad Hardware License, Version 0.51, see LICENSE for details.
# SPDX-License-Identifier: SHL-0.51

Expand Down
7 changes: 7 additions & 0 deletions Bender.local
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
# Copyright 2023 ETH Zurich and University of Bologna.
# Solderpad Hardware License, Version 0.51, see LICENSE for details.
# SPDX-License-Identifier: SHL-0.51

# Authors:
# - Thomas Benz <tbenz@iis.ee.ethz.ch>

overrides:
axi: { git: "https://github.com/pulp-platform/axi.git", version: 0.39.1 }
11 changes: 7 additions & 4 deletions Bender.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# Copyright 2022 ETH Zurich and University of Bologna.
# Copyright 2023 ETH Zurich and University of Bologna.
# Solderpad Hardware License, Version 0.51, see LICENSE for details.
# SPDX-License-Identifier: SHL-0.51

# Authors:
# - Thomas Benz <tbenz@iis.ee.ethz.ch>

package:
name: idma
authors:
Expand Down Expand Up @@ -74,21 +77,21 @@ sources:
files:
# Level 0
- src/frontend/desc64/idma_desc64_synth_pkg.sv
- src/synth/idma_nd_backend_synth.sv
- src/midend/idma_nd_midend_synth.sv
# Level 1
- src/frontend/desc64/idma_desc64_synth.sv

# Testbenches
- target: test
files:
# Level 0
- test/tb_idma_improved_fifo.sv
- test/tb_idma_nd_backend.sv
- test/frontend/tb_idma_desc64_top.sv
- test/frontend/tb_idma_desc64_bench.sv
- test/future/idma_tb_per2axi.sv
- test/future/idma_obi_asserter.sv
- test/future/TLToAXI4.v
- test/future/tb_idma_improved_fifo.sv
- test/midend/tb_idma_nd_midend.sv
# Level 1
- test/future/idma_obi2axi_bridge.sv
- test/future/idma_tilelink2axi_bridge.sv
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,24 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## Unreleased

### Fixed

### Changed
- Various cleanup and modernization passes: CI, documentation, scripts
- Rework ND-front-ends for both 32 and 64-bit systems [#30](https://github.com/pulp-platform/iDMA/pull/30),
[#32](https://github.com/pulp-platform/iDMA/pull/32), [#33](https://github.com/pulp-platform/iDMA/pull/33)
- Remove default system wrappers and drivers
- Update descriptor-based frontend [#18](https://github.com/pulp-platform/iDMA/pull/18),
[#26](https://github.com/pulp-platform/iDMA/pull/26)
- Update tracer to the multiprotocol version of iDMA [#8](https://github.com/pulp-platform/iDMA/pull/8)

### Added
- Add true multiprotocol capabilities to iDMA using MARIO [#22](https://github.com/pulp-platform/iDMA/pull/22)
- Add RT midend [#24](https://github.com/pulp-platform/iDMA/pull/24)
- Add Mempool midend [#34](https://github.com/pulp-platform/iDMA/pull/34)

## 0.5.1 - 2023-10-21

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 ETH Zurich and University of Bologna.
# Copyright 2023 ETH Zurich and University of Bologna.
# Solderpad Hardware License, Version 0.51, see LICENSE for details.
# SPDX-License-Identifier: SHL-0.51

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# iDMA
[![CI status](https://github.com/pulp-platform/idma/actions/workflows/gitlab-ci.yml/badge.svg?branch=master)](https://github.com/pulp-platform/idma/actions/workflows/gitlab-ci.yml?query=branch%3Amaster)
[![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/pulp-platform/iDMA?color=blue&label=current&sort=semver)](CHANGELOG.md)
[![SHL-0.51 license](https://img.shields.io/badge/license-SHL--0.51-green)](LICENSE)

Expand Down
7 changes: 5 additions & 2 deletions doc/src/conf.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# Copyright 2022 ETH Zurich and University of Bologna.
# Copyright 2023 ETH Zurich and University of Bologna.
# Solderpad Hardware License, Version 0.51, see LICENSE for details.
# SPDX-License-Identifier: SHL-0.51
#

# Authors:
# - Michael Rogenmoser <michaero@iis.ee.ethz.ch>

# Configuration file for the Sphinx documentation builder.
#
# This file does only contain a selection of the most common options. For a
Expand Down
10 changes: 5 additions & 5 deletions idma.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 ETH Zurich and University of Bologna.
# Copyright 2023 ETH Zurich and University of Bologna.
# Solderpad Hardware License, Version 0.51, see LICENSE for details.
# SPDX-License-Identifier: SHL-0.51

Expand Down Expand Up @@ -232,9 +232,9 @@ IDMA_RTL_DOC_ALL += $(foreach Y,$(IDMA_BACKEND_IDS),$(IDMA_HTML_DIR)/idma_backen
IDMA_PICKLE_ALL += $(foreach Y,$(IDMA_BACKEND_IDS),$(IDMA_PICKLE_DIR)/idma_backend_synth_$Y.sv)

# nDs
IDMA_RTL_DOC_ALL += $(IDMA_DOC_FIG_DIR)/graph/idma_nd_backend_synth.png
IDMA_RTL_DOC_ALL += $(IDMA_HTML_DIR)/idma_nd_backend_synth/index.html
IDMA_PICKLE_ALL += $(IDMA_PICKLE_DIR)/idma_nd_backend_synth.sv
IDMA_RTL_DOC_ALL += $(IDMA_DOC_FIG_DIR)/graph/idma_nd_midend_synth.png
IDMA_RTL_DOC_ALL += $(IDMA_HTML_DIR)/idma_nd_midend_synth/index.html
IDMA_PICKLE_ALL += $(IDMA_PICKLE_DIR)/idma_nd_midend_synth.sv

# descriptor-based frontend
IDMA_RTL_DOC_ALL += $(IDMA_DOC_FIG_DIR)/graph/idma_desc64_synth.png
Expand Down Expand Up @@ -392,7 +392,7 @@ idma_spinx_doc_clean:

IDMA_NONFREE_REMOTE ?= git@iis-git.ee.ethz.ch:bslk/idma/idma-non-free.git
IDMA_NONFREE_DIR ?= $(IDMA_ROOT)/nonfree
IDMA_NONFREE_COMMIT ?= dev-tbenz
IDMA_NONFREE_COMMIT ?= deploy

idma_nonfree_init:
git clone $(IDMA_NONFREE_REMOTE) $(IDMA_NONFREE_DIR)
Expand Down
4 changes: 2 additions & 2 deletions jobs/jobs.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@
"ErrorHandling" : 0
},
"proc_id" : "rw_axi",
"testbench": "tb_idma_nd_backend",
"synth_top": "idma_nd_backend_synth"
"testbench": "tb_idma_nd_midend",
"synth_top": "idma_nd_midend_synth"
},
"desc64": {
"jobs" : {
Expand Down
2 changes: 1 addition & 1 deletion scripts/list-contributors
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright 2022 ETH Zurich and University of Bologna.
# Copyright 2023 ETH Zurich and University of Bologna.
# Solderpad Hardware License, Version 0.51, see LICENSE for details.
# SPDX-License-Identifier: SHL-0.51

Expand Down
2 changes: 1 addition & 1 deletion scripts/list-todos
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright 2022 ETH Zurich and University of Bologna.
# Copyright 2023 ETH Zurich and University of Bologna.
# Solderpad Hardware License, Version 0.51, see LICENSE for details.
# SPDX-License-Identifier: SHL-0.51

Expand Down
4 changes: 2 additions & 2 deletions src/backend/idma_axi_read.sv
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright 2022 ETH Zurich and University of Bologna.
// Copyright 2023 ETH Zurich and University of Bologna.
// Solderpad Hardware License, Version 0.51, see LICENSE for details.
// SPDX-License-Identifier: SHL-0.51

// Authors:
// - Thomas Benz <tbenz@iis.eeethz.ch>
// - Thomas Benz <tbenz@iis.ee.ethz.ch>
// - Tobias Senti <tsenti@ethz.ch>

`include "common_cells/registers.svh"
Expand Down
4 changes: 2 additions & 2 deletions src/backend/idma_axi_write.sv
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright 2022 ETH Zurich and University of Bologna.
// Copyright 2023 ETH Zurich and University of Bologna.
// Solderpad Hardware License, Version 0.51, see LICENSE for details.
// SPDX-License-Identifier: SHL-0.51

// Authors:
// - Thomas Benz <tbenz@iis.eeethz.ch>
// - Thomas Benz <tbenz@iis.ee.ethz.ch>
// - Tobias Senti <tsenti@ethz.ch>

`include "common_cells/registers.svh"
Expand Down
4 changes: 2 additions & 2 deletions src/backend/idma_axil_read.sv
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright 2022 ETH Zurich and University of Bologna.
// Copyright 2023 ETH Zurich and University of Bologna.
// Solderpad Hardware License, Version 0.51, see LICENSE for details.
// SPDX-License-Identifier: SHL-0.51

// Authors:
// - Thomas Benz <tbenz@iis.eeethz.ch>
// - Thomas Benz <tbenz@iis.ee.ethz.ch>
// - Tobias Senti <tsenti@ethz.ch>

/// Implementing the AXI Lite read task in the iDMA transport layer.
Expand Down
4 changes: 2 additions & 2 deletions src/backend/idma_axil_write.sv
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright 2022 ETH Zurich and University of Bologna.
// Copyright 2023 ETH Zurich and University of Bologna.
// Solderpad Hardware License, Version 0.51, see LICENSE for details.
// SPDX-License-Identifier: SHL-0.51

// Authors:
// - Thomas Benz <tbenz@iis.eeethz.ch>
// - Thomas Benz <tbenz@iis.ee.ethz.ch>
// - Tobias Senti <tsenti@ethz.ch>

/// Implementing the AXI Lite write task in the iDMA transport layer.
Expand Down
4 changes: 2 additions & 2 deletions src/backend/idma_axis_read.sv
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright 2022 ETH Zurich and University of Bologna.
// Copyright 2023 ETH Zurich and University of Bologna.
// Solderpad Hardware License, Version 0.51, see LICENSE for details.
// SPDX-License-Identifier: SHL-0.51

// Authors:
// - Thomas Benz <tbenz@iis.eeethz.ch>
// - Thomas Benz <tbenz@iis.ee.ethz.ch>
// - Tobias Senti <tsenti@ethz.ch>

/// Implementing the AXI Stream read task in the iDMA transport layer.
Expand Down
4 changes: 2 additions & 2 deletions src/backend/idma_axis_write.sv
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright 2022 ETH Zurich and University of Bologna.
// Copyright 2023 ETH Zurich and University of Bologna.
// Solderpad Hardware License, Version 0.51, see LICENSE for details.
// SPDX-License-Identifier: SHL-0.51

// Authors:
// - Thomas Benz <tbenz@iis.eeethz.ch>
// - Thomas Benz <tbenz@iis.ee.ethz.ch>
// - Tobias Senti <tsenti@ethz.ch>

/// Implementing the AXI Stream write task in the iDMA transport layer.
Expand Down
4 changes: 2 additions & 2 deletions src/backend/idma_channel_coupler.sv
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright 2022 ETH Zurich and University of Bologna.
// Copyright 2023 ETH Zurich and University of Bologna.
// Solderpad Hardware License, Version 0.51, see LICENSE for details.
// SPDX-License-Identifier: SHL-0.51

// Authors:
// - Thomas Benz <tbenz@iis.eeethz.ch>
// - Thomas Benz <tbenz@iis.ee.ethz.ch>

`include "common_cells/registers.svh"
`include "axi/typedef.svh"
Expand Down
4 changes: 2 additions & 2 deletions src/backend/idma_dataflow_element.sv
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright 2022 ETH Zurich and University of Bologna.
// Copyright 2023 ETH Zurich and University of Bologna.
// Solderpad Hardware License, Version 0.51, see LICENSE for details.
// SPDX-License-Identifier: SHL-0.51

// Authors:
// - Thomas Benz <tbenz@iis.eeethz.ch>
// - Thomas Benz <tbenz@iis.ee.ethz.ch>
// - Tobias Senti <tsenti@ethz.ch>

/// A byte-granular buffer holding data while it is copied.
Expand Down
4 changes: 2 additions & 2 deletions src/backend/idma_error_handler.sv
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright 2022 ETH Zurich and University of Bologna.
// Copyright 2023 ETH Zurich and University of Bologna.
// Solderpad Hardware License, Version 0.51, see LICENSE for details.
// SPDX-License-Identifier: SHL-0.51

// Authors:
// - Thomas Benz <tbenz@iis.eeethz.ch>
// - Thomas Benz <tbenz@iis.ee.ethz.ch>

`include "common_cells/registers.svh"
`include "common_cells/assertions.svh"
Expand Down
4 changes: 2 additions & 2 deletions src/backend/idma_init_read.sv
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright 2022 ETH Zurich and University of Bologna.
// Copyright 2023 ETH Zurich and University of Bologna.
// Solderpad Hardware License, Version 0.51, see LICENSE for details.
// SPDX-License-Identifier: SHL-0.51

// Authors:
// - Thomas Benz <tbenz@iis.eeethz.ch>
// - Thomas Benz <tbenz@iis.ee.ethz.ch>
// - Tobias Senti <tsenti@ethz.ch>

/// Implementing the INIT read task in the iDMA transport layer.
Expand Down
4 changes: 2 additions & 2 deletions src/backend/idma_obi_read.sv
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright 2022 ETH Zurich and University of Bologna.
// Copyright 2023 ETH Zurich and University of Bologna.
// Solderpad Hardware License, Version 0.51, see LICENSE for details.
// SPDX-License-Identifier: SHL-0.51

// Authors:
// - Thomas Benz <tbenz@iis.eeethz.ch>
// - Thomas Benz <tbenz@iis.ee.ethz.ch>
// - Tobias Senti <tsenti@ethz.ch>

/// Implementing the OBI read task in the iDMA transport layer.
Expand Down
4 changes: 2 additions & 2 deletions src/backend/idma_obi_write.sv
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright 2022 ETH Zurich and University of Bologna.
// Copyright 2023 ETH Zurich and University of Bologna.
// Solderpad Hardware License, Version 0.51, see LICENSE for details.
// SPDX-License-Identifier: SHL-0.51

// Authors:
// - Thomas Benz <tbenz@iis.eeethz.ch>
// - Thomas Benz <tbenz@iis.ee.ethz.ch>
// - Tobias Senti <tsenti@ethz.ch>

/// Implementing the OBI write task in the iDMA transport layer.
Expand Down
4 changes: 2 additions & 2 deletions src/backend/idma_tilelink_read.sv
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright 2022 ETH Zurich and University of Bologna.
// Copyright 2023 ETH Zurich and University of Bologna.
// Solderpad Hardware License, Version 0.51, see LICENSE for details.
// SPDX-License-Identifier: SHL-0.51

// Authors:
// - Thomas Benz <tbenz@iis.eeethz.ch>
// - Thomas Benz <tbenz@iis.ee.ethz.ch>
// - Tobias Senti <tsenti@ethz.ch>

`include "common_cells/registers.svh"
Expand Down
4 changes: 2 additions & 2 deletions src/backend/idma_tilelink_write.sv
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright 2022 ETH Zurich and University of Bologna.
// Copyright 2023 ETH Zurich and University of Bologna.
// Solderpad Hardware License, Version 0.51, see LICENSE for details.
// SPDX-License-Identifier: SHL-0.51

// Authors:
// - Thomas Benz <tbenz@iis.eeethz.ch>
// - Thomas Benz <tbenz@iis.ee.ethz.ch>
// - Tobias Senti <tsenti@ethz.ch>

`include "common_cells/registers.svh"
Expand Down
Loading

0 comments on commit 1d724c6

Please sign in to comment.