From e5125c9d5e5ddfaa470904d0d29bd4969ea62818 Mon Sep 17 00:00:00 2001 From: Yiannis Papadopoulos Date: Tue, 24 Jun 2025 16:00:56 -0400 Subject: [PATCH] rocr/aie: Correct calculation of neural cores and avoid error on invalid queue ID. --- runtime/hsa-runtime/core/driver/xdna/amd_xdna_driver.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/runtime/hsa-runtime/core/driver/xdna/amd_xdna_driver.cpp b/runtime/hsa-runtime/core/driver/xdna/amd_xdna_driver.cpp index ef4ab7696e..47e04c31a7 100644 --- a/runtime/hsa-runtime/core/driver/xdna/amd_xdna_driver.cpp +++ b/runtime/hsa-runtime/core/driver/xdna/amd_xdna_driver.cpp @@ -184,7 +184,7 @@ hsa_status_t XdnaDriver::GetNodeProperties(HsaNodeProperties& node_props, uint32 // Right now can only target N-1 columns as that is the number of shim DMAs // in NPU1 devices. - node_props.NumNeuralCores = (aie_metadata.cols - 1) * aie_metadata.rows; + node_props.NumNeuralCores = (aie_metadata.cols - 1) * aie_metadata.core.row_count; /// @todo XDNA driver currently only supports single-node AIE /// devices over PCIe. Update this once we can get topology /// information dynamically from the sysfs. @@ -623,10 +623,6 @@ hsa_status_t XdnaDriver::SubmitCmdChain(hsa_amd_aie_ert_packet_t* first_pkt, uin } }); - if (queue_id == AMDXDNA_INVALID_CTX_HANDLE) { - return HSA_STATUS_ERROR_INVALID_QUEUE; - } - auto hw_ctx_handle = static_cast(queue_id); // PDI cache. If the cache is updated, a new hardware context will be created for the queue. auto pdi_cache_it = hw_ctx_pdi_cache_map.find(hw_ctx_handle);