Only pass buffer location property if in simulation environment

[ericxu233]

This addresses #147.
We only pass in the buffer location property if the design is in simulation environment. Also, we have to query the offline mode since that information is not cached anywhere.

[pcolberg]

@ericxu233, you probably want to modify the code in acl_usm.cpp instead, and only pass on the buffer location property when in simulation.

[ericxu233]

Yeah, this needs to be changed again.

[pcolberg]

Thanks @ericxu233, this looks better! I would suggest that you limit the check specifically to the buffer_location property, corresponding to the title of the pull request. You can move the entire initialization of use_offline_only into the if (mem_id) { block on line 152-155, and only append the buffer location property when in simulation. That way the environment variable is only queried if the buffer location property was passed to clHostMemAllocINTEL() etc.

[pcolberg]

Thanks @ericxu233, this is good to go with the minor modifications detailed below 🙂

[pcolberg]

Perfect 🙂

For the FPGA runtime, we merge pull requests commit by commit, where each commit should be one self-contained change.

Could you squash your commits into a single commit and include the above pull-request description in the commit message?

You can use an interactive rebase to create the single commit:

git rebase -i intel/main

pick f4bc596 Only pass buffer location property if in simulation environemnt
pick 89d114e Modify buffer location property if in simulation environment in acl_usm.cpp
pick b50288c Pass buffer location property only if the environment is simulation
pick c79fde5 Fixed code to pass key-value pair of buffer location property in simulation mode

In the editor, set the subsequent commits to squash or s:

pick f4bc596 Only pass buffer location property if in simulation environemnt
s 89d114e Modify buffer location property if in simulation environment in acl_usm.cpp
s b50288c Pass buffer location property only if the environment is simulation
s c79fde5 Fixed code to pass key-value pair of buffer location property in simulation mode

Save and exit the editor, then polish the commit message in the next editor that opens.

Finally, force-push your branch with the new, single commit:

git push --force-with-lease ericxu233 USM-fix

[pcolberg]

Thanks @ericxu233 for squashing. I have pushed a cosmetic revision fixing a typo in environment and mentioning your link to the issue. I will merge once integration testing has passed.

[bsyrowik]

Looks good, thanks Eric!