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

Fix Vitis CI #1344

Merged
merged 8 commits into from Jan 19, 2023
Merged

Fix Vitis CI #1344

merged 8 commits into from Jan 19, 2023

Conversation

abejgonzalez
Copy link
Contributor

@abejgonzalez abejgonzalez commented Dec 22, 2022

This fixes the Vitis CI by adding a -ldl to the linker for all systems (should be safe for v18/20 Ubuntu systems). As part of this PR, I also regenerated an xclbin (@ 140MHz). Instead of placing it on the server, I instead download it from the internet (I created a publicly accessible bucket under the AWS CI account) so anyone could potentially build their own bitstream, add it to the S3 bucket, and just change the link to it. In the future, this can use a URI (once we add URI support back into the manager).

Related PRs / Issues

UI / API Impact

Verilog / AGFI Compatibility

Contributor Checklist

  • Is this PR's title suitable for inclusion in the changelog and have you added a changelog:<topic> label?
  • Did you add Scaladoc/docstring/doxygen to every public function/method?
  • Did you add at least one test demonstrating the PR?
  • Did you delete any extraneous prints/debugging code?
  • Did you state the UI / API impact?
  • Did you specify the Verilog / AGFI compatibility impact?
  • If applicable, did you regenerate and publicly share default AGFIs?
  • If applicable, did you apply the ci:fpga-deploy label?
  • If applicable, did you apply the Please Backport label?

Reviewer Checklist (only modified by reviewer)

Note: to run CI on PRs from forks, comment @Mergifyio copy main and manage the change from the new PR.

  • Is the title suitable for inclusion in the changelog and does the PR have a changelog:<topic> label?
  • Did you mark the proper release milestone?
  • Did you check whether all relevant Contributor checkboxes have been checked?

@davidbiancolin
Copy link
Contributor

In the distant past we used to use s3 to host FPGA images (in the fpga-zynq days). We could do the same with HWDB collateral.

@abejgonzalez
Copy link
Contributor Author

In the distant past we used to use s3 to host FPGA images (in the fpga-zynq days). We could do the same with HWDB collateral.

For users that don't have an AWS account (and maybe don't want one), would they be able to download S3 objects? My impression is that you are required to have an account to access anything in an S3 bucket.

@t14916
Copy link
Contributor

t14916 commented Dec 27, 2022

My impression is that you are required to have an account to access anything in an S3 bucket.

If the bucket is public, then you can access it without an account afaik. Should be able to just access it through the URI.

@abejgonzalez
Copy link
Contributor Author

abejgonzalez commented Dec 29, 2022

@t14916 This should now be good to re-review. The Vitis test failed with a -22 (see https://github.com/firesim/firesim/actions/runs/3803123263/jobs/6469259435#step:4:4676) but that's because Berkeley had to restart the machine hosting the FPGA for misc. OS updates. I've gone ahead and re-setup the CI machine to work properly and validated that it can run our FireSim tests. Happy to re-run the CI if you want to triple-check that this CI works (the Vitis CI previously passed before the restart).

@abejgonzalez
Copy link
Contributor Author

@t14916 @davidbiancolin This PR is ready for review.

Copy link
Contributor

@t14916 t14916 left a comment

Choose a reason for hiding this comment

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

LGTM, but just as an FYI your XRT shell PR here: #1385 is being merged into this branch so you might wanna either merge that first or merge it into main.

@abejgonzalez
Copy link
Contributor Author

LGTM, but just as an FYI your XRT shell PR here: #1385 is being merged into this branch so you might wanna either merge that first or merge it into main.

Yup. I did that on purpose so that the diff wasn't horrible since I was working on that PR on the same branch as this. GitHub is smart enough to change the base branch once this PR goes in.

@abejgonzalez abejgonzalez merged commit 6652b02 into main Jan 19, 2023
@abejgonzalez abejgonzalez deleted the fix-ci branch January 19, 2023 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog:fixed Put PR title in 'Fixed' section of changelog ci:fpga-deploy
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants