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

[Router] Move shim mux port mapping into DeviceModel #1083

Merged
merged 4 commits into from
Feb 6, 2025
Merged

Conversation

Yu-Zhewen
Copy link
Contributor

No description provided.

@Yu-Zhewen Yu-Zhewen requested a review from jtuyls February 6, 2025 12:13
// 2) shimDMA 1 --> North 7
// From BLI to shimDMA: 1) North 2 --> shimDMA 0
// 2) North 3 --> shimDMA 1
// Add special shim mux connections between DMA/NOC streams and BLI.
Copy link
Collaborator

Choose a reason for hiding this comment

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

I know it was introduced earlier, but what's BLI?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That doesn't seem relevant to us. Should I remove it?

According to the architecture spec: "The BLI block (Boundary Logic Interface) connects COE blocks at the boundary to the FPGA fabric."

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yeah, I don't think that's relevant to us.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Maybe good to remove indeed to avoid confusion.

Comment on lines 425 to 447
/// Maps an MM2S (shim DMA or NOC) port to its corresponding special shim mux
/// port.
llvm::SmallDenseMap<std::pair<StrmSwPortType, uint8_t>,
std::pair<StrmSwPortType, uint8_t>>
mm2sDmaNocToSpecialShimPortMap = {
{{StrmSwPortType::DMA, 0}, {StrmSwPortType::NORTH, 3}},
{{StrmSwPortType::DMA, 1}, {StrmSwPortType::NORTH, 7}},
{{StrmSwPortType::NOC, 0}, {StrmSwPortType::NORTH, 2}},
{{StrmSwPortType::NOC, 1}, {StrmSwPortType::NORTH, 3}},
{{StrmSwPortType::NOC, 2}, {StrmSwPortType::NORTH, 6}},
{{StrmSwPortType::NOC, 3}, {StrmSwPortType::NORTH, 7}}};

/// Maps an S2MM (shim DMA or NOC) port to its corresponding special shim mux
/// port.
llvm::SmallDenseMap<std::pair<StrmSwPortType, uint8_t>,
std::pair<StrmSwPortType, uint8_t>>
s2mmDmaNocToSpecialShimPortMap = {
{{StrmSwPortType::DMA, 0}, {StrmSwPortType::NORTH, 2}},
{{StrmSwPortType::DMA, 1}, {StrmSwPortType::NORTH, 3}},
{{StrmSwPortType::NOC, 0}, {StrmSwPortType::NORTH, 2}},
{{StrmSwPortType::NOC, 1}, {StrmSwPortType::NORTH, 3}},
{{StrmSwPortType::NOC, 2}, {StrmSwPortType::NORTH, 4}},
{{StrmSwPortType::NOC, 3}, {StrmSwPortType::NORTH, 5}}};
Copy link
Collaborator

Choose a reason for hiding this comment

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

These could be static const

{{StrmSwPortType::NOC, 2}, {StrmSwPortType::NORTH, 4}},
{{StrmSwPortType::NOC, 3}, {StrmSwPortType::NORTH, 5}}};

/// Retrieves the speicail shim mux port that connects a given MM2S or S2MM
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
/// Retrieves the speicail shim mux port that connects a given MM2S or S2MM
/// Retrieves the special shim mux port that connects a given MM2S or S2MM

Copy link
Collaborator

@jtuyls jtuyls left a comment

Choose a reason for hiding this comment

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

LGTM

@Yu-Zhewen Yu-Zhewen enabled auto-merge (squash) February 6, 2025 21:44
@Yu-Zhewen Yu-Zhewen merged commit 4108e90 into main Feb 6, 2025
7 checks passed
@Yu-Zhewen Yu-Zhewen deleted the zhewen_shimmux branch February 6, 2025 22:17
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