Issues with automated part number extraction logic

[salehjg]

Hi there,

Finally, after a year or two I have decided to give AWS F1 another try.
It seems that the logic to extract the FPGA part number from emconfigutil-generated JSON file fails with:

ERROR: JSON Key not found for filter "hardwarePlatform.board.part"

For the record, here is the content of the said JSON file:

{
    "Comment": "This file is auto-generated by the tool. Do not modify",
    "Version": {
        "FileVersion": "2.0",
        "ToolVersion": "2024.1"
    },
    "Platform": {
        "Boards": [
            {
                "Devices": [
                    {
                        "Name": "xilinx_aws-vu9p-f1_shell-v04261818_201920_4",
                        "DdrBanks": [
                            {
                                "Name": "mem0",
                                "Type": "ddr4",
                                "Size": "16GB"
                            },
                            {
                                "Name": "mem1",
                                "Type": "ddr4",
                                "Size": "16GB"
                            },
                            {
                                "Name": "mem2",
                                "Type": "ddr4",
                                "Size": "16GB"
                            },
                            {
                                "Name": "mem3",
                                "Type": "ddr4",
                                "Size": "16GB"
                            }
                        ]
                    }
                ],
                "NumBoards": "1"
            }
        ],
        "UnifiedPlatform": "true",
        "ExpandedPR": "false"
    }
}

Furthermore, here is my minimal CMakeLists.txt:

cmake_minimum_required(VERSION 3.20)
project(HelloWorld)

message("${CMAKE_MODULE_PATH}")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/hlslib/cmake)
message("${CMAKE_MODULE_PATH}")
find_package(Vitis REQUIRED)

add_executable(MyHostExecutable main.cpp)
include_directories(${Vitis_INCLUDE_DIRS})
target_link_libraries(MyHostExecutable ${Vitis_LIBRARIES})

# Will populate the "hw", "hw_emu", and "synthesis" targets
add_vitis_kernel(MyKernel FILES kernel.cpp)
add_vitis_program(MyKernel "xilinx_aws-vu9p-f1_shell-v04261818_201920_4")

Here is more info about the platform:

$ /opt/Xilinx/Vitis/2024.1/bin/platforminfo -l

{
    "platforms": [
        {
            "baseName": "xilinx_aws-vu9p-f1_shell-v04261818_201920_4",
            "version": "201920.3",
            "type": "sdaccel",
            "dataCenter": "true",
            "embedded": "false",
            "externalHost": "true",
            "serverManaged": "true",
            "platformState": "impl",
            "usesPR": "true",
            "platformFile": "\/home\/ubuntu\/aws\/Vitis\/aws_platform\/xilinx_aws-vu9p-f1_shell-v04261818_201920_4\/xilinx_aws-vu9p-f1_shell-v04261818_201920_4.xpfm"
        }
    ]
}

I use FPGA (Ubuntu) AMI on AWS EC2 which has Vitis 2024.1.
Is this a known issue? Any advice?

[salehjg]

So, its seems that this line is the culprit:

hlslib/cmake/FindVitis.cmake

Line 479 in f45eb33

if(NOT PROGRAM_PLATFORM_PART OR NOT "${${PROGRAM_TARGET}_PLATFORM}" STREQUAL "${PROGRAM_PLATFORM}")

Even when the part number is set manually using a CACHE INTERNAL variable, the conditional is still evaluated as True.

set(PROGRAM_PLATFORM_PART "xcvu9p-flga2104-2-e" CACHE INTERNAL "F1 part number")
...
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/hlslib/cmake)
find_package(Vitis REQUIRED)
add_vitis_kernel(MyKernel FILES kernel.cpp)
add_vitis_program(MyKernel "xilinx_aws-vu9p-f1_shell-v04261818_201920_4")

[salehjg]

Ok, it seems that changing the conditional to this, fixes the issue:

  if((NOT DEFINED PROGRAM_PLATFORM_PART) AND (NOT PROGRAM_PLATFORM_PART OR NOT "${${PROGRAM_TARGET}_PLATFORM}" STREQUAL "${PROGRAM_PLATFORM}"))

This is just to force it to be False if PROGRAM_PLATFORM_PART is defined before.

[definelicht]

Please open a PR and I'll be happy to review 🙌