Add chipStar (SPIR-V) support for HIP backends #1942
+74
−9
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,26 @@ | |
| from junit_common import * | ||
|
|
||
|
|
||
| def parse_env_assignment(arg: str) -> Tuple[str, str]: | ||
|
Member
There was a problem hiding this comment. @zatkins-dev is this how you want this to work and should this be in the core? JUNIT has become mainly yours, so I don't want to make changes without your OK. |
||
| """Parse a KEY=VAL string from the --env flag. | ||
|
|
||
| Args: | ||
| arg (str): The KEY=VAL string | ||
|
|
||
| Returns: | ||
| Tuple[str, str]: (key, value) pair | ||
|
|
||
| Raises: | ||
| argparse.ArgumentTypeError: if `arg` is not in KEY=VAL form | ||
| """ | ||
| if '=' not in arg: | ||
| raise argparse.ArgumentTypeError(f"--env expects KEY=VAL, got {arg!r}") | ||
| key, _, value = arg.partition('=') | ||
| if not key: | ||
| raise argparse.ArgumentTypeError(f"--env KEY must be non-empty, got {arg!r}") | ||
| return key, value | ||
|
|
||
|
|
||
| def create_argparser() -> argparse.ArgumentParser: | ||
| """Creates argument parser to read command line arguments | ||
|
|
||
|
|
@@ -30,6 +50,11 @@ def create_argparser() -> argparse.ArgumentParser: | |
| help='Search string to filter tests, using `re` package format') | ||
| parser.add_argument('-v', '--verbose', action='store_true', default=False, | ||
| help='print details for all runs, not just failures') | ||
| parser.add_argument('--env', dest='extra_env', action='append', default=[], metavar='KEY=VAL', | ||
| type=parse_env_assignment, | ||
| help='Set an environment variable for test subprocesses; may be repeated. ' | ||
| 'Useful for backend-specific runtime knobs (e.g. --env CHIP_LOGLEVEL=crit ' | ||
| 'to silence chipStar runtime messages on stderr).') | ||
| parser.add_argument('test', help='Test executable', nargs='?') | ||
|
|
||
| return parser | ||
|
|
@@ -198,6 +223,11 @@ def check_allowed_stdout(self, test: str) -> bool: | |
| if __name__ == '__main__': | ||
| args = create_argparser().parse_args() | ||
|
|
||
| # Apply --env KEY=VAL settings to the parent environment so worker | ||
| # processes (which copy os.environ in init_process) inherit them. | ||
| for key, value in args.extra_env: | ||
| os.environ[key] = value | ||
|
|
||
| result: TestSuite = run_tests( | ||
| args.test, | ||
| args.ceed_backends, | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ideally, we should automatically suppress the Chipstar warnings when we build with Chipstar so the test suite passes - so JUNIT_ARGS should be set appropriately by default if Chipstar is enabled