From 5e6095feccb371e9bce3faa6eff3439a92bab48b Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Thu, 3 Aug 2023 13:02:25 -0700 Subject: [PATCH 1/6] misc: Update MAINTAINERS.yaml documentation comment This comment is updated to reflect new gem5 policy and its move to GitHub and a Pull Request contribution model. Change-Id: Iec909ffa0cca254fdbe56ce3165cb948cdd0cbce --- MAINTAINERS.yaml | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/MAINTAINERS.yaml b/MAINTAINERS.yaml index c8b8957496..f7a00c8c95 100644 --- a/MAINTAINERS.yaml +++ b/MAINTAINERS.yaml @@ -1,23 +1,22 @@ # See CONTRIBUTING.md for details of gem5's contribution process. # # This file contains a list of gem5's subsystems and their -# maintainers. The key used to identifity a subsystem should be used -# as a tag in commit messages targetting that subsystem. At least one -# (not all) of these maintainers must review the patch before it can -# be pushed. These people will automatically be emailed when you -# upload the patch to Gerrit (https://gem5-review.googlesource.com). -# These subsystem keys mostly follow the directory structure. +# maintainers. The key used to identify a subsystem should be used +# as a tag in commit messages targeting that subsystem. Via our GitHub +# Pull Request system (https://github.com/gem5/gem5/pulls) a maintainer +# of the subsystem impacted by a pull request contribution will be added +# as an assignee to that pull request. Their role is be to referee the +# contribution (add a review, assign reviewers, suggest changes, etc.), then +# merge the contribution into the gem5 develop branch when they are satisfied +# with the change. # -# Maintainers have the following responsibilities: -# 1. That at least one maintainer of each subsystem reviews all -# changes to that subsystem (they will be automatically tagged and -# emailed on each new change). -# 2. They will complete your reviews in a timely manner (within a few -# business days). -# 3. They pledge to uphold gem5's community standards and its code of -# conduct by being polite and professional in their code -# reviews. See CODE-OF-CONDUCT.md. +# Maintainers assigned to a pull request are expected to acknowledge their +# assignment in 2 business days and to fully begin refereeing the contribution +# within a business week. # +# Maintainers pledge to uphold gem5's community standards and its code of +# conduct by being polite and professional in their interactions with +# contributors. See CODE-OF-CONDUCT.md. # # Entries in this file have the following format: # key: From 3f1518a1c213cf6e69abdf99ecb2f69cfa508b5e Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Thu, 3 Aug 2023 13:57:59 -0700 Subject: [PATCH 2/6] misc: Update subsystem maintainers in MAINTAINERS.yaml This change incorporates changes to the set of maintainers and the maintainers assigned to each subsystem based on individual maintainers' preferences. Change-Id: Ic2c39907763282e89936fa0d90e3c1a105a0d917 --- MAINTAINERS.yaml | 160 +++++++++++++---------------------------------- 1 file changed, 43 insertions(+), 117 deletions(-) diff --git a/MAINTAINERS.yaml b/MAINTAINERS.yaml index f7a00c8c95..25835d393b 100644 --- a/MAINTAINERS.yaml +++ b/MAINTAINERS.yaml @@ -39,82 +39,65 @@ pmc: status: maintained maintainers: - Andreas Sandberg - - Brad Beckmann - - David Wood - - Gabe Black - Giacomo Travaglini + - Matt Poremba - Jason Lowe-Power (chair) + - Zhengrong Wang + - Borius Shingarov - Matt Sinclair - - Tony Gutierrez - - Steve Reinhardt + - Bobby R. Bruce arch: desc: >- General architecture-specific components - status: maintained - maintainers: - - Gabe Black + status: orphaned arch-arm: status: maintained maintainers: - - Andreas Sandberg - Giacomo Travaglini + - Andreas Sandberg arch-gcn3: status: maintained maintainers: - - Matt Poremba - Matt Sinclair + - Matt Porema arch-vega: status: maintained maintainers: - - Matt Poremba - Matt Sinclair + - Matt Porema arch-mips: status: orphaned arch-power: - status: maintained - maintainers: - - Boris Shingarov + status: orphaned arch-riscv: status: orphaned arch-sparc: - status: maintained - maintainers: - - Gabe Black + status: orphaned arch-x86: - status: maintained - maintainers: - - Gabe Black + status: orphaned base: - status: maintained - maintainers: - - Bobby Bruce - - Daniel Carvalho + status: orphaned base-stats: status: orphaned configs: - status: maintained - maintainers: - - Jason Lowe-Power + status: orphaned cpu: desc: >- General changes to all CPU models (e.g., BaseCPU) - status: maintained - maintainers: - - Gabe Black - - Jason Lowe-Power + status: orphaned cpu-kvm: status: maintained @@ -122,33 +105,22 @@ cpu-kvm: - Andreas Sandberg cpu-minor: - status: maintained - maintainers: - - Zhengrong Wang + status: orphaned cpu-o3: status: orphaned cpu-simple: - status: maintained - maintainers: - - Jason Lowe-Power - - Gabe Black + status: orphaned dev: - status: maintained - maintainers: - - Gabe Black + status: orphaned dev-hsa: - status: maintained - maintainers: - - Matt Poremba + status: orphaned dev-amdgpu: - status: maintained - maintainers: - - Matt Poremba + status: orphaned dev-virtio: status: maintained @@ -158,47 +130,32 @@ dev-virtio: dev-arm: status: maintained maintainers: - - Andreas Sandberg - Giacomo Travaglini + - Andreas Sandberg doc: - status: maintained - maintainers: - - Bobby Bruce + status: orphaned ext: desc: >- Components external to gem5 - status: maintained - maintainers: - - Bobby Bruce - - Jason Lowe-Power + status: orphaned ext-testlib: - status: maintained - maintainers: - - Bobby Bruce - - Hoa Nguyen + status: orphaned fastmodel: desc: >- Changes relating to ARM Fast Models - status: maintained - maintainers: - - Gabe Black + status: orphaned gpu-compute: - status: maintained - maintainers: - - Matt Poremba - - Matt Sinclair + status: orphaned learning-gem5: desc: >- The code and configs for the Learning gem5 book - status: maintained - maintainers: - - Jason Lowe-Power + status: orphaned stdlib: desc: >- @@ -210,75 +167,54 @@ stdlib: mem: desc: >- General memory system (e.g., XBar, Packet) - status: maintained - maintainers: - - Nikos Nikoleris + status: orphaned mem-cache: desc: >- Classic caches and coherence - status: maintained - maintainers: - - Nikos Nikoleris - - Daniel Carvalho + status: orphaned mem-dram: - status: maintained - maintainers: - - Nikos Nikoleris + status: orphaned mem-garnet: desc: >- Garnet subcomponent of Ruby - status: maintained - maintainers: - - Srikant Bharadwaj + status: orphaned mem-ruby: desc: >- Ruby structures and protocols status: maintained maintainers: - - Jason Lowe-Power - Matt Sinclair misc: desc: >- Anything outside of the other categories - status: maintained - maintainers: - - Bobby Bruce - - Jason Lowe-Power + status: orphaned python: desc: >- Python SimObject wrapping and infrastructure - status: maintained - maintainers: - - Andreas Sandberg - - Jason Lowe-Power + status: orphaned resources: desc: >- The gem5-resources repo with auxiliary resources for simulation status: maintained maintainers: - - Bobby Bruce - - Jason Lowe-Power + - Bobby R. Bruce scons: desc: >- Build system - status: maintained - maintainers: - - Gabe Black + status: orphaned sim: desc: >- General simulation components - status: maintained - maintainers: - - Jason Lowe-Power + status: orphaned sim-se: desc: >- @@ -288,48 +224,38 @@ sim-se: system-arm: status: maintained maintainers: - - Andreas Sandberg - Giacomo Travaglini + - Andreas Sandberg systemc: desc: >- Code for the gem5 SystemC implementation and interface - status: maintained - maintainers: - - Gabe Black + status: orphaned tests: desc: >- testing changes status: maintained maintainers: - - Bobby Bruce + - Bobby R. Bruce util: - status: maintained - maintainers: - - Gabe Black + status: orphaned util-docker: status: maintained maintainers: - - Bobby Bruce + - Bobby R. Bruce util-m5: - status: maintained - maintainers: - - Gabe Black + status: orphaned util-gem5art: - status: maintained - maintainers: - - Bobby Bruce - - Jason Lowe-Power + status: orphaned website: desc: >- The gem5-website repo which contains the gem5.org site status: maintained maintainers: - - Bobby Bruce - - Hoa Nguyen + - Bobby R. Bruce From 23f78159ec443b907eb79eb1e3bea9151f98f928 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Thu, 3 Aug 2023 14:14:20 -0700 Subject: [PATCH 3/6] misc: Add 'experts' field to MAINTAINERS.yaml This field was added to give gem5 community members a change to register that they have expertise in a particular subsystem but do not much to assign themselves the responsibilities of a subsystem maintainer. Those who have registered interest on being an subsystem expert have been added. Change-Id: I8f532e381e8e42257b2a68ac48204131479d8cd0 --- MAINTAINERS.yaml | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS.yaml b/MAINTAINERS.yaml index 25835d393b..e5e8d1b968 100644 --- a/MAINTAINERS.yaml +++ b/MAINTAINERS.yaml @@ -26,11 +26,18 @@ # maintainers: # - John Doe # - Jane Doe -# +# experts: +# - Jack Doe +# - Jill Doe # # The status field should have one of the following values: # - maintained: The component has an active maintainer. # - orphaned: The component is looking for a new owner. +# +# The experts field is optional and used to identify people who are +# knowledgeable about the subsystem but are not responsible for it. Those +# listed as an expert are typically good to add as a reviewer for pull requests +# targeting that subsystem. pmc: @@ -93,11 +100,15 @@ base-stats: configs: status: orphaned + experts: + - Jason Lowe-Power cpu: desc: >- General changes to all CPU models (e.g., BaseCPU) status: orphaned + experts: + - Jason Lowe-Power cpu-kvm: status: maintained @@ -112,6 +123,8 @@ cpu-o3: cpu-simple: status: orphaned + experts: + - Jason Lowe-Power dev: status: orphaned @@ -140,9 +153,13 @@ ext: desc: >- Components external to gem5 status: orphaned + experts: + - Jason Lowe-Power ext-testlib: status: orphaned + experts: + - Bobby R. Bruce fastmodel: desc: >- @@ -156,6 +173,9 @@ learning-gem5: desc: >- The code and configs for the Learning gem5 book status: orphaned + experts: + - Jason Lowe-Power + - Bobby R. Bruce stdlib: desc: >- @@ -188,16 +208,23 @@ mem-ruby: status: maintained maintainers: - Matt Sinclair + experts: + - Jason Lowe-Power misc: desc: >- Anything outside of the other categories status: orphaned + experts: + - Jason Lowe-Power python: desc: >- Python SimObject wrapping and infrastructure status: orphaned + experts: + - Jason Lowe-Power + - Andreas Sandberg resources: desc: >- @@ -205,6 +232,8 @@ resources: status: maintained maintainers: - Bobby R. Bruce + experts: + - Jason Lowe-Power scons: desc: >- @@ -215,6 +244,8 @@ sim: desc: >- General simulation components status: orphaned + experts: + - Jason Lowe-Power sim-se: desc: >- From 557d532bc3d170f4544f7426b98b5f0a83716b2d Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Thu, 10 Aug 2023 15:46:02 -0700 Subject: [PATCH 4/6] misc: Add Jason Lowe-Power as website expert Change-Id: I52ebce434732bb921efc040397a9aa9538a6d1d9 --- MAINTAINERS.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS.yaml b/MAINTAINERS.yaml index e5e8d1b968..79d738cdaa 100644 --- a/MAINTAINERS.yaml +++ b/MAINTAINERS.yaml @@ -290,3 +290,5 @@ website: status: maintained maintainers: - Bobby R. Bruce + experts: + - Jason Lowe-Power From a41c6f8d84003fde6d81f0a0ee00ce95b565e910 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Thu, 10 Aug 2023 15:48:05 -0700 Subject: [PATCH 5/6] misc: Remove PMC/Maintainers list from MAINTAINERS.yaml Change-Id: I772fa31d0aeea5534355731d841cf2d118fa0df4 --- MAINTAINERS.yaml | 15 --------------- util/git-commit-msg.py | 3 +-- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/MAINTAINERS.yaml b/MAINTAINERS.yaml index 79d738cdaa..bbf6e50ddf 100644 --- a/MAINTAINERS.yaml +++ b/MAINTAINERS.yaml @@ -39,21 +39,6 @@ # listed as an expert are typically good to add as a reviewer for pull requests # targeting that subsystem. - -pmc: - desc: >- - PMC Members (general maintainers): - status: maintained - maintainers: - - Andreas Sandberg - - Giacomo Travaglini - - Matt Poremba - - Jason Lowe-Power (chair) - - Zhengrong Wang - - Borius Shingarov - - Matt Sinclair - - Bobby R. Bruce - arch: desc: >- General architecture-specific components diff --git a/util/git-commit-msg.py b/util/git-commit-msg.py index 12baad8c19..c12b0cd215 100755 --- a/util/git-commit-msg.py +++ b/util/git-commit-msg.py @@ -100,8 +100,7 @@ def _validateTags(commit_header): maintainer_dict = maintainers.Maintainers.from_file() valid_tags = [tag for tag, _ in maintainer_dict] - # Remove non-tag 'pmc' and add special tags not in MAINTAINERS.yaml - valid_tags.remove("pmc") + # Add special tags not in MAINTAINERS.yaml valid_tags.extend(["RFC", "WIP"]) tags = "".join(commit_header.split(":")[0].split()).split(",") From 6ca94359614a4628362e9ff3d6333a0979adf080 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Thu, 10 Aug 2023 15:52:00 -0700 Subject: [PATCH 6/6] misc: Add Matt P. as maintainer to requested tags Change-Id: Ifffb34acbf9ebf313e5bc09ebbfd2a44a017359a --- MAINTAINERS.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS.yaml b/MAINTAINERS.yaml index bbf6e50ddf..02a8b3eb7b 100644 --- a/MAINTAINERS.yaml +++ b/MAINTAINERS.yaml @@ -115,10 +115,14 @@ dev: status: orphaned dev-hsa: - status: orphaned + status: maintained + maintainers: + - Matt Poremba dev-amdgpu: - status: orphaned + status: maintained + maintainers: + - Matt Poremba dev-virtio: status: maintained @@ -152,7 +156,9 @@ fastmodel: status: orphaned gpu-compute: - status: orphaned + status: maintained + maintainers: + - Matt Poremba learning-gem5: desc: >-