Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generates CMake rules with e2e test artifacts layer #10891

Merged
merged 5 commits into from
Oct 27, 2022

Conversation

pzread
Copy link
Contributor

@pzread pzread commented Oct 24, 2022

Generates the cmake rules from e2e test artifacts layer added in #10901

This PR includes the changes in #10901

Note for helping review: Most of the code in build_tools/python/e2e_test_artifacts/cmake_generator/*.py are moved from build_tools/python/e2e_test_framework/cmake_rule_generator.py

@pzread pzread changed the title Add the artifacts layer to share directory structures across e2e tests Add the artifacts layer to share directory structs across e2e tests Oct 24, 2022
@pzread pzread changed the title Add the artifacts layer to share directory structs across e2e tests Add the artifacts layer to share dir structs across e2e tests Oct 24, 2022
@pzread pzread added infrastructure Relating to build systems, CI, or testing infrastructure/benchmark Relating to benchmarking infrastructure labels Oct 24, 2022
@pzread pzread requested a review from hcindyl October 24, 2022 22:55
@pzread pzread marked this pull request as ready for review October 24, 2022 22:55
@pzread pzread force-pushed the bench-artifacts-root branch from b0b201f to b6d2e78 Compare October 25, 2022 18:10
@pzread pzread changed the title Add the artifacts layer to share dir structs across e2e tests Generates CMake rules with e2e test artifacts layer Oct 25, 2022
@pzread
Copy link
Contributor Author

pzread commented Oct 25, 2022

I decided to split the change into two:

  1. Add the artifacts layer to share directory structs across e2e tests #10901 adds the artifacts layer
  2. Generates CMake rules with e2e test artifacts layer #10891 (this change) migrates the cmake generator to use the artifacts layer.

@@ -9,8 +9,6 @@
################################################################################
iree_package_name(_PACKAGE_NAME)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm... This file grows from the initial 59 LOC in #10308 to 1200 LOC in #10602 to 1500 LOC in this PR. Given it is a generated file, I wonder if we need to keep a copy in the codebase, or if it can be generated jit when building the benchmark suites.

Copy link
Contributor Author

@pzread pzread Oct 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We had a discussion before about generating the file during the cmake configuration. It's a little bit tricky but doable.

Right now I think it's still in the tolerated level. But I'll spend some time revisiting the solutions.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we please file an issue so we could look into this flow later?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Filed #10928

Comment on lines 18 to 22
@dataclass(frozen=True)
class IreeModelImportRule(object):
target_name: str
output_file_path: str
cmake_rules: List[str]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like a rule that is more suitable for the model_generator module.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is IREE specific rule, so I think it would be better to put it together with other IREE rules. model_generator will be used by other non-IREE benchmarks in the future, so we won't want them to import IREE rules.

@pzread pzread force-pushed the bench-artifacts-root branch 2 times, most recently from 9971eca to f796d82 Compare October 26, 2022 17:07
@pzread pzread requested a review from hcindyl October 26, 2022 17:57
Copy link
Contributor

@hcindyl hcindyl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Pending other reviewers with different feedback.

@@ -9,8 +9,6 @@
################################################################################
iree_package_name(_PACKAGE_NAME)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we please file an issue so we could look into this flow later?

@pzread pzread force-pushed the bench-artifacts-root branch from d46684a to 2223186 Compare October 27, 2022 17:52
@pzread pzread enabled auto-merge (squash) October 27, 2022 18:01
@pzread pzread merged commit 5601928 into iree-org:main Oct 27, 2022
PhaneeshB pushed a commit to PhaneeshB/iree that referenced this pull request Oct 31, 2022
hanhanW pushed a commit to hanhanW/iree that referenced this pull request Nov 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
infrastructure/benchmark Relating to benchmarking infrastructure infrastructure Relating to build systems, CI, or testing
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants