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

global: change simulator environment variable setting #156

Merged
merged 1 commit into from
Sep 22, 2022

Conversation

sophimao
Copy link
Contributor

  • Change name of the simulation project directory environment variable
  • Make the project directory environment variable imply the CL_CONTEXT_MPSIM_DEVICE_INTELFPGA

@sophimao sophimao marked this pull request as ready for review September 21, 2022 18:07
@pcolberg pcolberg changed the base branch from release/2022.3 to main September 22, 2022 18:41
@pcolberg
Copy link
Contributor

@sophimao I have changed the base branch to main since all commits should be integrated in that branch first. After merging, you can backport the commit from main to a release branch using these instructions.

Copy link
Contributor

@pcolberg pcolberg left a comment

Choose a reason for hiding this comment

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

Thanks @sophimao, the change looks good.

Could you rebase this onto main and clean up the commit message? The new variable does not shadow CL_CONTEXT_MPSIM_DEVICE_INTELFPGA; rather it is checked only when CL_CONTEXT_MPSIM_DEVICE_INTELFPGA is not set.

Assuming the remote repository name is intel:

git rebase -i intel/main

In the editor that opens, squash subsequent commits into the first commit:

pick 01b6620 globals: make runtime parse simulation project directory environment variable which overwrites CL_CONTEXT_MPSIM_DEVICE_INTELFPGA
squash f569e62 globals: change macro name to match the environment variable name
squash ac871c8 globals: make acl_get_offline_device_user_setting return number of simulation device when simulation spec dir shadows CL_CONTEXT_MPSIM_DEVICE_INTELFPGA
squash f1054d6 globals: change name of environment variable to cover IP authoring flow use case
squash 7ee878a globals: change name of the simulator device spec dir environment variable

Save and quit editor, and edit commit message in editor that opens:

; This is a combination of 5 commits.
; This is the 1st commit message:

globals: make runtime parse simulation project directory environment variable which overwrites CL_CONTEXT_MPSIM_DEVICE_INTELFPGA

; This is the commit message #2:

globals: change macro name to match the environment variable name

; This is the commit message #3:

globals: make acl_get_offline_device_user_setting return number of simulation device when simulation spec dir shadows CL_CONTEXT_MPSIM_DEVICE_INTELFPGA

; This is the commit message #4:

globals: change name of environment variable to cover IP authoring flow use case

; This is the commit message #5:

globals: change name of the simulator device spec dir environment variable

Save and quit editor, and force-push into your PR:

git push --force sophimao HEAD:sim-patch

… CL_CONTEXT_MPSIM_DEVICE_INTELFPGA is not set to force simulation flow
Copy link
Contributor

@pcolberg pcolberg left a comment

Choose a reason for hiding this comment

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

Perfect, thanks Sophie 🙂

@pcolberg pcolberg merged commit e928196 into intel:main Sep 22, 2022
@pcolberg
Copy link
Contributor

@sophimao could you submit a PR against the release branch as noted here?

@pcolberg pcolberg added this to the 2022.3 milestone Sep 22, 2022
@sophimao sophimao deleted the sim-patch branch September 23, 2022 17:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants