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

VITIS-8985 Refactor hw context metadata field in query requests #7610

Merged
merged 2 commits into from
Jul 4, 2023

Conversation

dbenusov
Copy link
Contributor

@dbenusov dbenusov commented Jun 30, 2023

Problem solved by the commit

https://jira.xilinx.com/browse/VITIS-8985

Clean up try/catch for memory report ptree creation.

Each hardware context report used different fields when accessing context metadata. It should use a single structure that is common to prevent confusion and allow passing of parameters.

Bug / issue (if any) fixed, which PR introduced the bug, how it was discovered

All hardware context reports must use the same data structure when referring to their ID and xclbin UUIDs.

How problem was solved, alternative solutions (if any) and why they were rejected

Made a common structure. Update the data parsing to use the new structures.

Risks (if any) associated the changes in the commit

Need to update MCDM to match the changes.

What has been tested and how, request additional testing if necessary

Ubuntu 20.04 VCK5000

dbenusov@xsjdbenusov50:/proj/rdi/staff/dbenusov$ xbutil reset -d 17:00
WARNING: Unexpected xocl version (2.14.0) was found. Expected 2.16.0, to match XRT tools.
***********************************************************
*        WARNING          WARNING          WARNING        *
*       SC version data missing. Upgrade your shell       *
***********************************************************
Performing 'HOT Reset' on '0000:17:00.1'
Are you sure you wish to proceed? [Y/n]: Y
Successfully reset Device[0000:17:00.1]
dbenusov@xsjdbenusov50:/proj/rdi/staff/dbenusov$ xbutil examine -d 17:00 -r memory
WARNING: Unexpected xocl version (2.14.0) was found. Expected 2.16.0, to match XRT tools.
***********************************************************
*        WARNING          WARNING          WARNING        *
*       SC version data missing. Upgrade your shell       *
***********************************************************

---------------------------------------------------
[0000:17:00.1] : xilinx_vck5000_gen4x8_qdma_base_2
---------------------------------------------------

  DMA Transfer Metrics
    Chan[ 0].h2c:  0 Byte
    Chan[ 0].c2h:  0 Byte
    Chan[ 1].h2c:  0 Byte
    Chan[ 1].c2h:  0 Byte
    Chan[ 2].h2c:  0 Byte
    Chan[ 2].c2h:  0 Byte
    Chan[ 3].h2c:  0 Byte
    Chan[ 3].c2h:  0 Byte
    Chan[ 4].h2c:  0 Byte
    Chan[ 4].c2h:  0 Byte
    Chan[ 5].h2c:  0 Byte
    Chan[ 5].c2h:  0 Byte
    Chan[ 6].h2c:  0 Byte
    Chan[ 6].c2h:  0 Byte
    Chan[ 7].h2c:  0 Byte
    Chan[ 7].c2h:  0 Byte

dbenusov@xsjdbenusov50:/proj/rdi/staff/dbenusov$ xbutil validate -d 17:00 -r verify
WARNING: Unexpected xocl version (2.14.0) was found. Expected 2.16.0, to match XRT tools.
***********************************************************
*        WARNING          WARNING          WARNING        *
*       SC version data missing. Upgrade your shell       *
***********************************************************
Validate Device           : [0000:17:00.1]
    Platform              : xilinx_vck5000_gen4x8_qdma_base_2
    SC Version            : 4.4.35
    Platform ID           : 05DCA096-76CB-730B-8D19-EC1192FBAE3F
-------------------------------------------------------------------------------
Verbose: Enabling Verbosity
Test 1 [0000:17:00.1]     : verify
    Description           : Run 'Hello World' kernel test
    Xclbin                : /opt/xilinx/firmware/vck5000/gen4x8-qdma/base/test
    Testcase              : /opt/xilinx/xrt/test/validate.exe
    Test Status           : [PASSED]
-------------------------------------------------------------------------------
Validation completed
dbenusov@xsjdbenusov50:/proj/rdi/staff/dbenusov$ xbutil examine -d 17:00 -r memory
WARNING: Unexpected xocl version (2.14.0) was found. Expected 2.16.0, to match XRT tools.
***********************************************************
*        WARNING          WARNING          WARNING        *
*       SC version data missing. Upgrade your shell       *
***********************************************************

---------------------------------------------------
[0000:17:00.1] : xilinx_vck5000_gen4x8_qdma_base_2
---------------------------------------------------

  Memory Topology
    HW Context Slot: 0
      Xclbin UUID: dbce0895-5e2b-70bb-4ff7-9f03227d71df
      Index  Tag      Type      Temp(C)  Size      Base Address
      ------------------------------------------------------------
      0      MC_NOC0  MEM_DDR4  N/A      12288 MB  0xc100000000
      1      BRAM     MEM_DRAM  N/A      128 KB    0x20204000000

  DMA Transfer Metrics
    Chan[ 0].h2c:  0 Byte
    Chan[ 0].c2h:  64 Byte
    Chan[ 1].h2c:  0 Byte
    Chan[ 1].c2h:  0 Byte
    Chan[ 2].h2c:  0 Byte
    Chan[ 2].c2h:  0 Byte
    Chan[ 3].h2c:  0 Byte
    Chan[ 3].c2h:  0 Byte
    Chan[ 4].h2c:  0 Byte
    Chan[ 4].c2h:  0 Byte
    Chan[ 5].h2c:  0 Byte
    Chan[ 5].c2h:  0 Byte
    Chan[ 6].h2c:  0 Byte
    Chan[ 6].c2h:  0 Byte
    Chan[ 7].h2c:  0 Byte
    Chan[ 7].c2h:  0 Byte

Documentation impact (if any)

None. JSON output is the same.

@gbuildx
Copy link
Collaborator

gbuildx commented Jun 30, 2023

Build Passed!

@chvamshi-xilinx chvamshi-xilinx merged commit 1101f8d into Xilinx:master Jul 4, 2023
2 checks passed
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.

4 participants