From 17bd8f7369816b33366236a787606f6dabe11422 Mon Sep 17 00:00:00 2001 From: psykose Date: Mon, 15 May 2023 10:45:56 +0000 Subject: [PATCH] main/llvm14: correctly disable unittest --- main/llvm14/APKBUILD | 4 ++-- main/llvm14/allocscore.patch | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 main/llvm14/allocscore.patch diff --git a/main/llvm14/APKBUILD b/main/llvm14/APKBUILD index 3d50e668792..77ce33a2380 100644 --- a/main/llvm14/APKBUILD +++ b/main/llvm14/APKBUILD @@ -27,6 +27,7 @@ checkdepends="bash coreutils diffutils" subpackages="$pkgname-static $pkgname-libs $pkgname-dev $pkgname-test-utils:_test_utils" source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-$pkgver.src.tar.xz 0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch + allocscore.patch fix-memory-mf_exec-on-aarch64.patch install-prefix.patch lfs64.patch @@ -135,8 +136,6 @@ prepare() { test/CodeGen/X86/vector-interleaved-load-i32-stride-4.ll \ test/Transforms/SampleProfile/pseudo-probe-update-2.ll \ test/Transforms/SampleProfile/pseudo-probe-update.ll - sed -i "/RegAllocScoreTest.cpp/d" \ - unittests/CodeGen/CMakeLists.txt } build() { @@ -313,6 +312,7 @@ _mv() { sha512sums=" 6461bdde27aac17fa44c3e99a85ec47ffb181d0d4e5c3ef1c4286a59583e3b0c51af3c8081a300f45b99524340773a3011380059e3b3a571c3b0a8733e96fc1d llvm-14.0.6.src.tar.xz 6021b5a39843d645a8c63d558568f120d0d91a1ce209e46f0b980253fafb18dfc2078ef39cf63b0900f4313e3c5636320b3c179ff7a4e220d06aec2455063993 0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch +ed189ae609c73ab91c0973c3aeb334158370a1a2879f17fed93900f9225f34ca483aa1513d76b9f9f01d94221aa703642398fe7005f5fe878bf43d9ffbeac057 allocscore.patch dd5efd88abdd13db3b17bde8735c2ddb1ed1ac690a8ab06072e3e91f87d7ede924dcb513ee31b855d304fe43246619e5fa83fcbaeabb256b3b96ff4ebaf3b110 fix-memory-mf_exec-on-aarch64.patch 7a87da5ee5f9d4db21974023eab88645610fdfae856e445f402169bc2aed74ab3861ad03974421aaa2312e24efb55bdbcd312146eb12b52f5c8c7515713bd40f install-prefix.patch e288e8d3389536f1f040c0ae8a8eae168de8eedba6040efd5f477701e18529711329a279c6b86d5214ab44efaa6e27818d109be78891ee93e241a0ab1b3a0c5a lfs64.patch diff --git a/main/llvm14/allocscore.patch b/main/llvm14/allocscore.patch new file mode 100644 index 00000000000..659afb6afab --- /dev/null +++ b/main/llvm14/allocscore.patch @@ -0,0 +1,20 @@ +on x86, this fails with a float comparison error even though the floats are the +same, because it does absolute eq +-- +--- a/unittests/CodeGen/RegAllocScoreTest.cpp ++++ b/unittests/CodeGen/RegAllocScoreTest.cpp +@@ -172,14 +172,5 @@ + ASSERT_EQ(Freq2, TotalScore.loadStoreCounts()); + ASSERT_EQ(Freq1, TotalScore.cheapRematCounts()); + ASSERT_EQ(Freq2, TotalScore.expensiveRematCounts()); +- ASSERT_EQ(TotalScore.getScore(), +- TotalScore.copyCounts() * CopyWeight + +- TotalScore.loadCounts() * LoadWeight + +- TotalScore.storeCounts() * StoreWeight + +- TotalScore.loadStoreCounts() * (LoadWeight + StoreWeight) + +- TotalScore.cheapRematCounts() * CheapRematWeight + +- TotalScore.expensiveRematCounts() * ExpensiveRematWeight +- +- ); + } + } // end namespace