switch to host, primary, or over-arching as appropriate
Signed-off-by: Scott Johnson <scottdj@google.com>
diff --git a/util/dvsim/FlowCfg.py b/util/dvsim/FlowCfg.py
index fec3c46..64ac88d 100644
--- a/util/dvsim/FlowCfg.py
+++ b/util/dvsim/FlowCfg.py
@@ -51,15 +51,15 @@
# are overridden with the override values.
self.overrides = []
- # List of cfgs if the parsed cfg is a master cfg list
+ # List of cfgs if the parsed cfg is a primary cfg list
self.cfgs = []
- # Add a notion of "master" cfg - this is indicated using
+ # Add a notion of "primary" cfg - this is indicated using
# a special key 'use_cfgs' within the hjson cfg.
- self.is_master_cfg = False
+ self.is_primary_cfg = False
- # For a master cfg, it is the aggregated list of all deploy objects under self.cfgs.
- # For a non-master cfg, it is the list of items slated for dispatch.
+ # For a primary cfg, it is the aggregated list of all deploy objects under self.cfgs.
+ # For a non-primary cfg, it is the list of items slated for dispatch.
self.deploy = []
# Timestamp
@@ -97,7 +97,7 @@
def __post_init__(self):
# Run some post init checks
- if not self.is_master_cfg:
+ if not self.is_primary_cfg:
# Check if self.cfgs is a list of exactly 1 item (self)
if not (len(self.cfgs) == 1 and self.cfgs[0].name == self.name):
log.error("Parse error!\n%s", self.cfgs)
@@ -129,12 +129,12 @@
'''
hjson_dict = parse_hjson(flow_cfg_file)
- # Check if this is the master cfg, if this is the entry point cfg file
+ # Check if this is the primary cfg, if this is the entry point cfg file
if is_entry_point:
- self.is_master_cfg = self.check_if_master_cfg(hjson_dict)
+ self.is_primary_cfg = self.check_if_primary_cfg(hjson_dict)
- # If not a master cfg, then register self with self.cfgs
- if self.is_master_cfg is False:
+ # If not a primary cfg, then register self with self.cfgs
+ if self.is_primary_cfg is False:
self.cfgs.append(self)
# Resolve the raw hjson dict to build this object
@@ -148,8 +148,8 @@
self.rel_path = os.path.dirname(self.flow_cfg_file).replace(
self.proj_root + '/', '')
- def check_if_master_cfg(self, hjson_dict):
- # This is a master cfg only if it has a single key called "use_cfgs"
+ def check_if_primary_cfg(self, hjson_dict):
+ # This is a primary cfg only if it has a single key called "use_cfgs"
# which contains a list of actual flow cfgs.
hjson_cfg_dict_keys = hjson_dict.keys()
return ("use_cfgs" in hjson_cfg_dict_keys and type(hjson_dict["use_cfgs"]) is list)
@@ -226,15 +226,15 @@
import_cfgs.extend(hjson_dict[key])
rm_hjson_dict_keys.append(key)
- # If this is a master cfg list and the key is 'use_cfgs'
- elif self.is_master_cfg and key == "use_cfgs":
+ # If this is a primary cfg list and the key is 'use_cfgs'
+ elif self.is_primary_cfg and key == "use_cfgs":
use_cfgs.extend(hjson_dict[key])
- # If this is a not master cfg list and the key is 'use_cfgs'
- elif not self.is_master_cfg and key == "use_cfgs":
+ # If this is a not primary cfg list and the key is 'use_cfgs'
+ elif not self.is_primary_cfg and key == "use_cfgs":
# Throw an error and exit
log.error(
- "Key \"use_cfgs\" encountered in a non-master cfg file list \"%s\"",
+ "Key \"use_cfgs\" encountered in a non-primary cfg file list \"%s\"",
self.flow_cfg_file)
sys.exit(1)
@@ -254,8 +254,8 @@
else:
log.error("Cfg file \"%s\" has already been parsed", cfg_file)
- # Parse master cfg files
- if self.is_master_cfg:
+ # Parse primary cfg files
+ if self.is_primary_cfg:
for entry in use_cfgs:
if type(entry) is str:
# Treat this as a file entry
@@ -290,10 +290,10 @@
def _conv_inline_cfg_to_hjson(self, idict):
'''Dump a temp hjson file in the scratch space from input dict.
- This method is to be called only by a master cfg'''
+ This method is to be called only by a primary cfg'''
- if not self.is_master_cfg:
- log.fatal("This method can only be called by a master cfg")
+ if not self.is_primary_cfg:
+ log.fatal("This method can only be called by a primary cfg")
sys.exit(1)
name = idict["name"] if "name" in idict.keys() else None
@@ -412,7 +412,7 @@
item._print_list()
def prune_selected_cfgs(self):
- '''Prune the list of configs for a master config file'''
+ '''Prune the list of configs for a primary config file'''
# This should run after self.cfgs has been set
assert self.cfgs
@@ -421,10 +421,10 @@
if self.select_cfgs is None:
return
- # If the user passed --select-cfgs, but this isn't a master config
+ # If the user passed --select-cfgs, but this isn't a primary config
# file, we should probably complain.
- if not self.is_master_cfg:
- log.error('The configuration file at {!r} is not a master config, '
+ if not self.is_primary_cfg:
+ log.error('The configuration file at {!r} is not a primary config, '
'but --select-cfgs was passed on the command line.'
.format(self.flow_cfg_file))
sys.exit(1)
@@ -443,7 +443,7 @@
'''Public facing API for _create_deploy_objects().
'''
self.prune_selected_cfgs()
- if self.is_master_cfg:
+ if self.is_primary_cfg:
self.deploy = []
for item in self.cfgs:
item._create_deploy_objects()
@@ -475,7 +475,7 @@
results.append(result)
self.errors_seen |= item.errors_seen
- if self.is_master_cfg:
+ if self.is_primary_cfg:
self.gen_results_summary()
self.gen_email_html_summary()
@@ -492,7 +492,7 @@
return "[%s](%s)" % (link_text, results_page_url)
def gen_email_html_summary(self):
- if self.is_master_cfg:
+ if self.is_primary_cfg:
# user can customize email content by using email_summary_md,
# otherwise default to send out results_summary_md
gen_results = self.email_summary_md or self.results_summary_md
@@ -651,7 +651,7 @@
for item in self.cfgs:
item._publish_results()
- if self.is_master_cfg:
+ if self.is_primary_cfg:
self.publish_results_summary()
def publish_results_summary(self):
diff --git a/util/dvsim/LintCfg.py b/util/dvsim/LintCfg.py
index 6cb895c..f28e14f 100644
--- a/util/dvsim/LintCfg.py
+++ b/util/dvsim/LintCfg.py
@@ -107,7 +107,7 @@
# parsing script that transforms the tool output into the hjson above
# needs to be adapted.
#
- # note that if this is a master config, the results will
+ # note that if this is a primary config, the results will
# be generated using the _gen_results_summary function
# '''
diff --git a/util/dvsim/OneShotCfg.py b/util/dvsim/OneShotCfg.py
index 578ba47..d574133 100644
--- a/util/dvsim/OneShotCfg.py
+++ b/util/dvsim/OneShotCfg.py
@@ -93,8 +93,8 @@
self.__dict__,
ignored_wildcards)
- # Stuff below only pertains to individual cfg (not master cfg).
- if not self.is_master_cfg:
+ # Stuff below only pertains to individual cfg (not primary cfg).
+ if not self.is_primary_cfg:
# Print info
log.info("[scratch_dir]: [%s]: [%s]", self.name, self.scratch_path)
@@ -113,7 +113,7 @@
self._process_exports()
# Create objects from raw dicts - build_modes, sim_modes, run_modes,
- # tests and regressions, only if not a master cfg obj
+ # tests and regressions, only if not a primary cfg obj
self._create_objects()
# Post init checks
diff --git a/util/dvsim/SimCfg.py b/util/dvsim/SimCfg.py
index 62516d7..2060c45 100644
--- a/util/dvsim/SimCfg.py
+++ b/util/dvsim/SimCfg.py
@@ -160,7 +160,7 @@
self.cov_report_deploy = None
self.results_summary = OrderedDict()
- # If is_master_cfg is set, then each cfg will have its own cov_deploy.
+ # If is_primary_cfg is set, then each cfg will have its own cov_deploy.
# Maintain an array of those in cov_deploys.
self.cov_deploys = []
@@ -190,19 +190,19 @@
self.__dict__ = find_and_substitute_wildcards(self.__dict__,
self.__dict__,
ignored_wildcards,
- self.is_master_cfg)
+ self.is_primary_cfg)
# Set the title for simulation results.
self.results_title = self.name.upper() + " Simulation Results"
- # Stuff below only pertains to individual cfg (not master cfg)
+ # Stuff below only pertains to individual cfg (not primary cfg)
# or individual selected cfgs (if select_cfgs is configured via command line)
# TODO: find a better way to support select_cfgs
- if not self.is_master_cfg and (not self.select_cfgs or
- self.name in self.select_cfgs):
+ if not self.is_primary_cfg and (not self.select_cfgs or
+ self.name in self.select_cfgs):
# If self.tool is None at this point, there was no --tool argument on
# the command line, and there is no default tool set in the config
- # file. That's ok if this is a master config (where the
+ # file. That's ok if this is a primary config (where the
# sub-configurations can choose tools themselves), but not otherwise.
if self.tool is None:
log.error('Config file does not specify a default tool, '
@@ -227,7 +227,7 @@
self._process_exports()
# Create objects from raw dicts - build_modes, sim_modes, run_modes,
- # tests and regressions, only if not a master cfg obj
+ # tests and regressions, only if not a primary cfg obj
self._create_objects()
# Post init checks
diff --git a/util/dvsim/SynCfg.py b/util/dvsim/SynCfg.py
index 4a6991c..53473da 100644
--- a/util/dvsim/SynCfg.py
+++ b/util/dvsim/SynCfg.py
@@ -119,7 +119,7 @@
# }
# }
#
- # note that if this is a master config, the results will
+ # note that if this is a primary config, the results will
# be generated using the _gen_results_summary function
# '''
diff --git a/util/dvsim/dvsim.py b/util/dvsim/dvsim.py
index 16c28c3..3f94485 100755
--- a/util/dvsim/dvsim.py
+++ b/util/dvsim/dvsim.py
@@ -244,10 +244,10 @@
whatg.add_argument("--select-cfgs",
nargs="*",
metavar="CFG",
- help=('The .hjson file is a master config. Only run '
+ help=('The .hjson file is a primary config. Only run '
'the given configs from it. If this argument is '
'not used, dvsim will process all configs listed '
- 'in a master config.'))
+ 'in a primary config.'))
disg = parser.add_argument_group('Dispatch options')
diff --git a/util/fpga/README.md b/util/fpga/README.md
index 85d41fa..dab4314 100644
--- a/util/fpga/README.md
+++ b/util/fpga/README.md
@@ -20,7 +20,7 @@
This directory contains following files:
-* `splice_nexysvideo.sh` - master script
+* `splice_nexysvideo.sh` - main script to load memory contents into bitfile
* `bram_load.mmi` - format which vivado tool understands on which FPGA
BRAM locations the SW contents should go
* `addr4x.py` - utility script used underneath to do address calculation
diff --git a/util/i2csvg/convert.py b/util/i2csvg/convert.py
index 452ee16..bf93e17 100644
--- a/util/i2csvg/convert.py
+++ b/util/i2csvg/convert.py
@@ -2,7 +2,7 @@
# Licensed under the Apache License, Version 2.0, see LICENSE for details.
# SPDX-License-Identifier: Apache-2.0
#
-# Convert I2C master format to SVG
+# Convert I2C host format to SVG
import logging as log
from collections import namedtuple
@@ -121,7 +121,7 @@
S - Start flag, P - stop flag,
R - read flag, C - continue read flag, N - NackOk flag
followed by the data byte
- Special cases:
+ Special cases:
M - indicates multiple bytes instead of data byte
A - followed by 0 or 1 address/direction or 2 address/data
Data value in quotes is a tag
diff --git a/util/i2csvg/smbus/SMBus.md b/util/i2csvg/smbus/SMBus.md
index 8dad018..173363b 100644
--- a/util/i2csvg/smbus/SMBus.md
+++ b/util/i2csvg/smbus/SMBus.md
@@ -1,6 +1,6 @@
-# Using I2C master for SMBus commands
+# Using I2C host for SMBus commands
-The I2C master can generate all the SMBus commands listed in the Rev 3.0 SMBus specification.
+The I2C host can generate all the SMBus commands listed in the Rev 3.0 SMBus specification.
### Quick Command
diff --git a/util/simplespi/spitest.py b/util/simplespi/spitest.py
index 14d754c..f69004e 100755
--- a/util/simplespi/spitest.py
+++ b/util/simplespi/spitest.py
@@ -87,8 +87,8 @@
# interfaces start from 1 here, so this is Channel A (called 0 in jtag)
spi.configure('ftdi://ftdi:2232h/1')
- # Get a port to a SPI slave w/ /CS on A*BUS3 and SPI mode 0 @ 1MHz
- slave = spi.get_port(cs=0, freq=1E6, mode=0)
+ # Get a port to a SPI device w/ /CS on A*BUS3 and SPI mode 0 @ 1MHz
+ device = spi.get_port(cs=0, freq=1E6, mode=0)
# Get GPIO port to manage extra pins
# BUS4 = JTAG TRST_N, BUS5 = JTAG SRST_N, BUS6 = JTAG_SPIN
@@ -120,7 +120,7 @@
print("Select SPI")
gpio.write(0x30)
- # Synchronous exchange with the remote SPI slave
+ # Synchronous exchange with the remote SPI device
if args.length:
s = ''
for i in range(args.length):
@@ -137,7 +137,7 @@
while len(s):
write_buf = bytes(s[:4], encoding='utf8')
- read_buf = slave.exchange(write_buf, duplex=True).tobytes()
+ read_buf = device.exchange(write_buf, duplex=True).tobytes()
print("Got " + str(read_buf))
s = s[4:]
