onednn: update to 3.6.2

mingw-w64-onednn/001-aarch64-mingw.patch

@@ -1,92 +0,0 @@
-diff --git a/src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64.h b/src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64.h
-index b4f545bcf1d..ab1e8a538af 100644
---- a/src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64.h
-+++ b/src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64.h
-@@ -37,7 +37,7 @@
- #include <unordered_set>
- #include <vector>
- 
--#if defined(__GNUC__) || defined(__APPLE__)
-+#if (defined(__GNUC__) || defined(__APPLE__)) && !defined(_WIN32)
- #ifndef XBYAK_USE_MMAP_ALLOCATOR
- #define XBYAK_USE_MMAP_ALLOCATOR
- #endif
-@@ -46,7 +46,7 @@
- #include <cmath>
- #include <functional>
- 
--#if defined(__GNUC__)
-+#if defined(__GNUC__) && !defined(_WIN32)
- #include <cassert>
- #include <stdlib.h>
- #include <sys/mman.h>
-diff --git a/src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64_code_array.h b/src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64_code_array.h
-index 8acaf8029c6..afb78509d1c 100644
---- a/src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64_code_array.h
-+++ b/src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64_code_array.h
-@@ -20,7 +20,7 @@
- static const size_t CSIZE = sizeof(uint32_t);
- 
- inline void *AlignedMalloc(size_t size, size_t alignment) {
--#ifdef _MSC_VER
-+#if defined(_WIN32)
-   return _aligned_malloc(size, alignment);
- #else
-   void *p;
-@@ -30,7 +30,7 @@ inline void *AlignedMalloc(size_t size, size_t alignment) {
- }
- 
- inline void AlignedFree(void *p) {
--#ifdef _MSC_VER
-+#if defined(_WIN32)
-   _aligned_free(p);
- #else
-   free(p);
-@@ -277,7 +277,7 @@ class CodeArray {
-     default:
-       return false;
-     }
--#if defined(__GNUC__) || defined(__APPLE__)
-+#if (defined(__GNUC__) || defined(__APPLE__)) && !defined(_WIN32)
-     size_t pageSize = inner::getPageSize();
-     size_t iaddr = reinterpret_cast<size_t>(addr);
-     size_t roundAddr = iaddr & ~(pageSize - static_cast<size_t>(1));
-diff --git a/src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64_inner.h b/src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64_inner.h
-index d79d6d600db..5ecc1f3ecb4 100644
---- a/src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64_inner.h
-+++ b/src/cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64_inner.h
-@@ -20,7 +20,7 @@ enum { DEFAULT_MAX_CODE_SIZE = 4096 };
- namespace inner {
- 
- inline size_t getPageSize() {
--#ifdef __GNUC__
-+#if defined(__GNUC__) && !defined(_WIN32)
-   static const size_t pageSize = sysconf(_SC_PAGESIZE);
- #else
-   static const size_t pageSize = 4096;
-diff --git a/tests/benchdnn/common.cpp b/tests/benchdnn/common.cpp
-index 9d53ee30438..33641e7d2cb 100644
---- a/tests/benchdnn/common.cpp
-+++ b/tests/benchdnn/common.cpp
-@@ -328,7 +328,7 @@ bool skip_start(res_t *res, int idx) {
-     return false;
- }
- 
--#if defined(_WIN32) && !defined(__GNUC__)
-+#if defined(_WIN32)
- #include <windows.h>
- #define PATH_MAX MAX_PATH
- static char *dirname(char *path) {
-diff --git a/tests/benchdnn/dnnl_common.cpp b/tests/benchdnn/dnnl_common.cpp
-index 8bd151d978d..deb9d58c07d 100644
---- a/tests/benchdnn/dnnl_common.cpp
-+++ b/tests/benchdnn/dnnl_common.cpp
-@@ -839,7 +839,7 @@ bool is_f64_supported(const dnnl_engine_t &engine) {
-     return false;
- }
- 
--#if defined(_WIN32) && !defined(__GNUC__)
-+#if defined(_WIN32)
- #include "windows.h"
- 
- static size_t get_cpu_ram_size() {

mingw-w64-onednn/PKGBUILD

@@ -3,8 +3,8 @@
 _realname=onednn
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
-pkgver=3.3.4
+pkgver=3.6.2
-pkgrel=2
+pkgrel=1
 pkgdesc='oneAPI Deep Neural Network Library (oneDNN) (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -15,17 +15,9 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || echo "${MINGW_PACKAGE_PREFIX}-uasm"))
+             $([[ ${CARCH} == aarch64 ]] || echo "${MINGW_PACKAGE_PREFIX}-uasm"))
-source=("https://github.com/oneapi-src/oneDNN/archive/v${pkgver}.tar.gz"
+source=("https://github.com/oneapi-src/oneDNN/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
-        "001-aarch64-mingw.patch")
+sha256sums=('e79db0484dcefe2c7ff6604c295d1de2830c828941898878c80dfb062eb344d1')
-sha256sums=('e291fa4702f4bcfa6c8c23cb5b6599f0fefa8f23bc08edb9e15ddc5254ab7843'
-            'b337b3d21da46b5263f32dc1b779266548bb544288c99c8cd8b56f9835ab00bb')
-
-prepare() {
-  cd "${srcdir}"/${_realname}-${pkgver}
-
-  patch -Np1 -i "${srcdir}"/001-aarch64-mingw.patch
-}
 
 build() {
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
@@ -37,12 +29,15 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
+  if [[ ${CARCH} == x86_64 ]]; then
+    extra_config+=('-DCMAKE_ASM_MASM_COMPILER="uasm;-win64"')
+  fi
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -GNinja \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    ${extra_config[@]} \
+    "${extra_config[@]}" \
-    $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || echo -DCMAKE_ASM_MASM_COMPILER="uasm;-win64") \
     -DDNNL_BUILD_EXAMPLES=OFF \
     -DDNNL_BUILD_TESTS=OFF \
     ../oneDNN-$pkgver
@@ -54,5 +49,6 @@ package() {
   cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="$pkgdir" ${MINGW_PREFIX}/bin/cmake --install .
 
-  install -D -m644 "${srcdir}"/oneDNN-${pkgver}/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
+  install -D -m644 "${srcdir}"/oneDNN-${pkgver}/LICENSE \
+    "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }