From 10dab9e6663ab816d61df0a39aa1ca7c1e038329 Mon Sep 17 00:00:00 2001 From: Maksim Levental Date: Fri, 23 Aug 2024 11:58:05 -0500 Subject: [PATCH] try runner with updated driver --- .github/workflows/ci-linux.yml | 4 +-- .../AMD-AIE/iree-amd-aie/Target/XCLBinGen.cpp | 28 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index 93774a9dc..989b8fc7a 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -91,12 +91,12 @@ jobs: test_linux: name: E2E Test linux - runs-on: amd7940hs + runs-on: nod-nuc-linux-2 needs: build_and_ctest strategy: fail-fast: true env: - XILINXD_LICENSE_FILE: /home/svcnod/Xilinx.lic + XILINXD_LICENSE_FILE: /opt/xilinx/Xilinx.lic steps: - name: "Checking out repository" # for test scripts uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0 diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Target/XCLBinGen.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Target/XCLBinGen.cpp index b7c2b1578..31af9f905 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Target/XCLBinGen.cpp +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Target/XCLBinGen.cpp @@ -93,20 +93,20 @@ using Path = std::filesystem::path; namespace { FailureOr getNPUVersion() { - std::string errorMessage; - auto maybeVbnv = - openInputFile("/sys/bus/pci/devices/0000:c5:00.1/vbnv", &errorMessage); - if (!maybeVbnv) { - llvm::errs() << "couldn't read pci info for npu because: " << errorMessage; - return failure(); - } - - std::string vbnv = std::string{maybeVbnv->getBuffer()}; - std::regex rgx("RyzenAI-(.*)"); - std::smatch matches; - if (std::regex_search(vbnv, matches, rgx)) return {matches[1]}; - llvm::errs() << "couldn't find npu version in " << vbnv; - return failure(); + // std::string errorMessage; + // auto maybeVbnv = + // openInputFile("/sys/bus/pci/devices/0000:c5:00.1/vbnv", &errorMessage); + // if (!maybeVbnv) { + // llvm::errs() << "couldn't read pci info for npu because: " << errorMessage; + // return failure(); + // } + // + // std::string vbnv = std::string{maybeVbnv->getBuffer()}; + // std::regex rgx("RyzenAI-(.*)"); + // std::smatch matches; + // if (std::regex_search(vbnv, matches, rgx)) return {matches[1]}; + // llvm::errs() << "couldn't find npu version in " << vbnv; + return std::string{"npu1"}; } FailureOr getTargetDir() {