oneDNN: Support for existing onednn_graph dialect ops + unit tests.

Author: AndreyPavlenko

src/dnnl/JsonParser.cpp

@@ -245,11 +245,11 @@ inline mlir::Attribute JsonParser::readAttr() {
   } else if (_str == "s64[]") {
     _ia64.clear();
     readNumArray(_ia64);
-    attr = _builder.getI64ArrayAttr(_ia64);
+    attr = _builder.getDenseI64ArrayAttr(_ia64);
   } else if (_str == "f32[]") {
     _fa32.clear();
     readNumArray(_fa32);
-    attr = _builder.getF32ArrayAttr(_fa32);
+    attr = _builder.getDenseF32ArrayAttr(_fa32);
   } else if (_str == "string") {
     _reader.read_string(&_str);
     attr = _builder.getStringAttr(_str);

src/dnnl/JsonParser.h

@@ -27,7 +27,13 @@
 #include <stdfloat>
 #else
 namespace std {
+#if defined(__SIZEOF_FLOAT__) && __SIZEOF_FLOAT__ == 4
 using float32_t = float;
+#elif defined(__SIZEOF_DOUBLE__) && __SIZEOF_DOUBLE__ == 4
+using float32_t = double;
+#else
+static_assert(false, "Unable to determine 32-bit floating point type");
+#endif
 } // namespace std
 #endif
 
@@ -145,8 +151,16 @@ class JsonParser {
   }
   std::unordered_map<std::string, OpBuilderFn> _opBuilders{
       GC_OP("Add", mlir::onednn_graph::AddOp),
+      GC_OP("Divide", mlir::onednn_graph::DivOp),
       GC_OP("MatMul", mlir::onednn_graph::MatMulOp),
+      GC_OP("Multiply", mlir::onednn_graph::MulOp),
+      GC_OP("Pow", mlir::onednn_graph::PowOp),
+      GC_OP("ReduceMean", mlir::onednn_graph::ReduceMeanOp),
+      GC_OP("ReduceSum", mlir::onednn_graph::ReduceSumOp),
       GC_OP("ReLU", mlir::onednn_graph::ReLUOp),
+      GC_OP("Sigmoid", mlir::onednn_graph::SigmoidOp),
+      GC_OP("Subtract", mlir::onednn_graph::SubOp),
+      GC_OP("Typecast", mlir::onednn_graph::TypeCastOp),
   };
 #undef GC_OP
 

test/dnnl/DnnlTestUtils.h

@@ -11,7 +11,21 @@
 #include <sstream>
 #include <string>
 
-static std::string read_str_resource(const std::string &name) {
+#if __cplusplus > 202002L
+#include <stdfloat>
+#else
+namespace std {
+#if defined(__SIZEOF_FLOAT__) && __SIZEOF_FLOAT__ == 4
+using float32_t = float;
+#elif defined(__SIZEOF_DOUBLE__) && __SIZEOF_DOUBLE__ == 4
+using float32_t = double;
+#else
+static_assert(false, "No 32-bit floating point type available");
+#endif
+} // namespace std
+#endif
+
+static std::string readStrResource(const std::string &name) {
   std::filesystem::path res_dir{"resources"};
   auto path = std::filesystem::absolute(res_dir / name);
   std::ifstream file(path);

test/dnnl/TestApiBasic.cpp

@@ -13,7 +13,7 @@
 #include "graph/backend/elyzor/include/dnnl_graph_compiler.h"
 
 TEST(TestApiBasic, basicWorkflow) {
-  auto json = read_str_resource("add.json");
+  auto json = readStrResource("add.json");
 
   const struct dnnl_graph_compiler_context ctx = {.num_threads = 4};
   const struct dnnl_graph_compiler *gc;

test/dnnl/TestApiOps.cpp

@@ -0,0 +1,308 @@
+//===-- TestApiOps.cpp - OneDNN operations test -----------------*- C++ -*-===//
+//
+// This file is licensed under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include <cmath>
+#include <gtest/gtest.h>
+
+#include <llvm/ADT/APFloat.h>
+
+#include "DnnlTestUtils.h"
+#include "graph/backend/elyzor/include/dnnl_graph_compiler.h"
+
+static void exec(const char *fileName, dnnl_graph_compiler_tensor *inputs,
+                 dnnl_graph_compiler_tensor *outputs) {
+  auto json = readStrResource(fileName);
+  const struct dnnl_graph_compiler *gc;
+  const struct dnnl_graph_compiler_executable *exe;
+  ASSERT_EQ(dnnl_graph_compiler_create(nullptr, &gc), dnnl_success);
+  ASSERT_EQ(dnnl_graph_compiler_compile(gc, json.c_str(), &exe), dnnl_success);
+  ASSERT_EQ(dnnl_graph_compiler_execute(gc, exe, inputs, outputs),
+            dnnl_success);
+  dnnl_graph_compiler_destroy_executable(gc, exe);
+  dnnl_graph_compiler_destroy(gc);
+}
+
+TEST(TestApiOps, div) {
+  dnnl_graph_compiler_tensor inputs[2];
+  dnnl_graph_compiler_tensor outputs[1];
+  int64_t dims[1] = {128};
+  std::float32_t arg1[128];
+  std::float32_t arg2[128];
+  std::float32_t arg3[128];
+  inputs[0] = {.id = 0, .ndims = 1, .dims = dims, .data = arg1};
+  inputs[1] = {.id = 1, .ndims = 1, .dims = dims, .data = arg2};
+  outputs[0] = {.id = 2, .ndims = 1, .dims = dims, .data = arg3};
+  for (auto i = 0; i < 128; i++) {
+    arg1[i] = static_cast<std::float32_t>(std::pow(i, 2) / 128.f);
+    arg2[i] = arg1[i] + 1;
+  }
+
+  exec("div.json", inputs, outputs);
+
+  for (auto i = 0; i < 128; i++) {
+    ASSERT_EQ(arg3[i], arg1[i] / arg2[i]);
+  }
+}
+
+TEST(TestApiOps, matMul) {
+  dnnl_graph_compiler_tensor inputs[3];
+  dnnl_graph_compiler_tensor outputs[1];
+  int64_t dimsA[2] = {128, 512};
+  int64_t dimsB[2] = {128, 64};
+  int64_t dimsBias[1] = {64};
+  int64_t dimsOut[2] = {512, 64};
+  std::float32_t argA[128][512];
+  std::float32_t argB[128][64];
+  std::float32_t argBias[64];
+  std::float32_t argOut[512][64];
+  inputs[0] = {.id = 0, .ndims = 2, .dims = dimsA, .data = argA};
+  inputs[1] = {.id = 1, .ndims = 2, .dims = dimsB, .data = argB};
+  inputs[2] = {.id = 2, .ndims = 1, .dims = dimsBias, .data = argBias};
+  outputs[0] = {.id = 3, .ndims = 2, .dims = dimsOut, .data = argOut};
+
+  // Initialize input tensors
+  for (auto i = 0; i < 128; i++) {
+    for (auto j = 0; j < 512; j++) {
+      argA[i][j] = static_cast<std::float32_t>(i + j);
+    }
+  }
+  for (auto i = 0; i < 128; i++) {
+    for (auto j = 0; j < 64; j++) {
+      argB[i][j] = static_cast<std::float32_t>(i - j);
+    }
+  }
+  for (auto i = 0; i < 64; i++) {
+    argBias[i] = static_cast<std::float32_t>(i);
+  }
+
+  exec("matmul.json", inputs, outputs);
+
+  // Calculate expected output
+  std::float32_t expected[512][64];
+  for (auto i = 0; i < 512; i++) {
+    for (auto j = 0; j < 64; j++) {
+      expected[i][j] = argBias[j];
+      for (auto k = 0; k < 128; k++) {
+        expected[i][j] += argA[k][i] * argB[k][j]; // transpose_a = true
+      }
+    }
+  }
+
+  // Compare the results
+  for (auto i = 0; i < 512; i++) {
+    for (auto j = 0; j < 64; j++) {
+      ASSERT_EQ(expected[i][j], argOut[i][j]);
+    }
+  }
+}
+
+TEST(TestApiOps, mul) {
+  dnnl_graph_compiler_tensor inputs[2];
+  dnnl_graph_compiler_tensor outputs[1];
+  int64_t dims[1] = {128};
+  std::float32_t arg1[128];
+  std::float32_t arg2[128];
+  std::float32_t arg3[128];
+  inputs[0] = {.id = 0, .ndims = 1, .dims = dims, .data = arg1};
+  inputs[1] = {.id = 1, .ndims = 1, .dims = dims, .data = arg2};
+  outputs[0] = {.id = 2, .ndims = 1, .dims = dims, .data = arg3};
+  for (auto i = 0; i < 128; i++) {
+    arg1[i] = arg2[i] = static_cast<std::float32_t>(i);
+  }
+
+  exec("mul.json", inputs, outputs);
+
+  for (auto i = 0; i < 128; i++) {
+    ASSERT_EQ(arg3[i], static_cast<std::float32_t>(i * i));
+  }
+}
+
+TEST(TestApiOps, sub) {
+  dnnl_graph_compiler_tensor inputs[2];
+  dnnl_graph_compiler_tensor outputs[1];
+  int64_t dims[1] = {128};
+  std::float32_t arg1[128];
+  std::float32_t arg2[128];
+  std::float32_t arg3[128];
+  inputs[0] = {.id = 0, .ndims = 1, .dims = dims, .data = arg1};
+  inputs[1] = {.id = 1, .ndims = 1, .dims = dims, .data = arg2};
+  outputs[0] = {.id = 2, .ndims = 1, .dims = dims, .data = arg3};
+  for (auto i = 0; i < 128; i++) {
+    arg1[i] = static_cast<std::float32_t>(i);
+    arg2[i] = arg1[i] * arg1[i];
+  }
+
+  exec("sub.json", inputs, outputs);
+
+  for (auto i = 0; i < 128; i++) {
+    ASSERT_EQ(arg3[i], arg1[i] - arg2[i]);
+  }
+}
+
+TEST(TestApiOps, pow) {
+  dnnl_graph_compiler_tensor inputs[1];
+  dnnl_graph_compiler_tensor outputs[1];
+  int64_t dims[1] = {64};
+  std::float32_t arg1[64];
+  std::float32_t arg2[64];
+  inputs[0] = {.id = 0, .ndims = 1, .dims = dims, .data = arg1};
+  outputs[0] = {.id = 1, .ndims = 1, .dims = dims, .data = arg2};
+  for (auto i = 0; i < 64; i++) {
+    arg1[i] = static_cast<std::float32_t>(i);
+  }
+
+  exec("pow.json", inputs, outputs);
+
+  for (auto i = 0; i < 64; i++) {
+    ASSERT_EQ(arg1[i] * arg1[i], arg2[i]);
+  }
+}
+
+TEST(TestApiOps, relu) {
+  dnnl_graph_compiler_tensor inputs[1];
+  dnnl_graph_compiler_tensor outputs[1];
+  int64_t dims[1] = {128};
+  std::float32_t arg1[128];
+  std::float32_t arg2[128];
+  inputs[0] = {.id = 0, .ndims = 1, .dims = dims, .data = arg1};
+  outputs[0] = {.id = 1, .ndims = 1, .dims = dims, .data = arg2};
+
+  for (auto i = 0; i < 128; i++) {
+    arg1[i] = static_cast<std::float32_t>(i - 64);
+  }
+
+  exec("relu.json", inputs, outputs);
+
+  for (auto i = 0; i < 128; i++) {
+    ASSERT_EQ(arg1[i] < 0 ? 0 : arg1[i], arg2[i]);
+  }
+}
+
+TEST(TestApiOps, reduceMean) {
+  dnnl_graph_compiler_tensor inputs[1];
+  dnnl_graph_compiler_tensor outputs[1];
+  int64_t dims1[3] = {16, 64, 32};
+  int64_t dims2[3] = {16, 1, 32};
+  std::float32_t arg1[16][64][32];
+  std::float32_t arg2[16][1][32];
+  inputs[0] = {.id = 0, .ndims = 3, .dims = dims1, .data = arg1};
+  outputs[0] = {.id = 1, .ndims = 3, .dims = dims2, .data = arg2};
+
+  for (auto i = 0; i < 16; i++) {
+    for (auto y = 0; y < 64; y++) {
+      for (auto z = 0; z < 32; z++) {
+        arg1[i][y][z] = static_cast<std::float32_t>(i * 64 * 32 + y * 32 + z);
+      }
+    }
+  }
+
+  exec("reduce_mean.json", inputs, outputs);
+
+  std::float32_t expected[16][1][32];
+  for (auto x = 0; x < 16; x++) {
+    for (auto z = 0; z < 32; z++) {
+      expected[x][0][z] = 0;
+      for (auto y = 0; y < 64; y++) {
+        expected[x][0][z] += arg1[x][y][z];
+      }
+      expected[x][0][z] /= 64;
+    }
+  }
+
+  for (auto x = 0; x < 16; x++) {
+    for (auto z = 0; z < 32; z++) {
+      ASSERT_EQ(expected[x][0][z], arg2[x][0][z]);
+    }
+  }
+}
+
+TEST(TestApiOps, reduceSum) {
+  dnnl_graph_compiler_tensor inputs[1];
+  dnnl_graph_compiler_tensor outputs[1];
+  int64_t dims1[3] = {16, 64, 32};
+  int64_t dims2[3] = {16, 1, 32};
+  std::float32_t arg1[16][64][32];
+  std::float32_t arg2[16][1][32];
+  inputs[0] = {.id = 0, .ndims = 3, .dims = dims1, .data = arg1};
+  outputs[0] = {.id = 1, .ndims = 3, .dims = dims2, .data = arg2};
+
+  for (auto i = 0; i < 16; i++) {
+    for (auto y = 0; y < 64; y++) {
+      for (auto z = 0; z < 32; z++) {
+        arg1[i][y][z] = static_cast<std::float32_t>(i * 64 * 32 + y * 32 + z);
+      }
+    }
+  }
+
+  exec("reduce_sum.json", inputs, outputs);
+
+  std::float32_t expected[16][1][32];
+  for (auto x = 0; x < 16; x++) {
+    for (auto z = 0; z < 32; z++) {
+      expected[x][0][z] = 0;
+      for (auto y = 0; y < 64; y++) {
+        expected[x][0][z] += arg1[x][y][z];
+      }
+    }
+  }
+
+  for (auto x = 0; x < 16; x++) {
+    for (auto z = 0; z < 32; z++) {
+      ASSERT_EQ(expected[x][0][z], arg2[x][0][z]);
+    }
+  }
+}
+
+TEST(TestApiOps, sigmoid) {
+  dnnl_graph_compiler_tensor inputs[1];
+  dnnl_graph_compiler_tensor outputs[1];
+  int64_t dims[1] = {128};
+  std::float32_t arg1[128];
+  std::float32_t arg2[128];
+  inputs[0] = {.id = 0, .ndims = 1, .dims = dims, .data = arg1};
+  outputs[0] = {.id = 1, .ndims = 1, .dims = dims, .data = arg2};
+  for (auto i = 0; i < 128; i++) {
+    arg1[i] = static_cast<std::float32_t>(i - 64);
+  }
+
+  exec("sigmoid.json", inputs, outputs);
+
+  for (auto i = 0; i < 128; i++) {
+    ASSERT_EQ(1.f / (1.f + std::exp(-arg1[i])), arg2[i]);
+  }
+}
+
+TEST(TestApiOps, typecast) {
+  dnnl_graph_compiler_tensor inputs[1];
+  dnnl_graph_compiler_tensor outputs[1];
+  int64_t dims[1] = {128};
+  std::float32_t arg1[128];
+  uint16_t arg2[128];
+  inputs[0] = {.id = 0, .ndims = 1, .dims = dims, .data = arg1};
+  outputs[0] = {.id = 1, .ndims = 1, .dims = dims, .data = arg2};
+  for (auto i = 0; i < 128; i++) {
+    auto x = i - 64;
+    arg1[i] = static_cast<std::float32_t>(x / (std::exp(-x)));
+  }
+
+  exec("typecast.json", inputs, outputs);
+
+  for (auto i = 0; i < 128; i++) {
+    llvm::APFloat f(arg1[i]);
+    bool losesInfo;
+    f.convert(llvm::APFloat::IEEEhalf(), llvm::APFloat::rmNearestTiesToEven,
+              &losesInfo);
+    ASSERT_EQ(static_cast<uint16_t>(f.bitcastToAPInt().getZExtValue()),
+              arg2[i]);
+  }
+}
+
+int main(int argc, char **argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}

test/dnnl/TestJsonParser.cpp

@@ -36,7 +36,7 @@ static mlir::ModuleOp parse(const char *fileName,
 #endif
   }();
 
-  auto json = read_str_resource(fileName);
+  auto json = readStrResource(fileName);
   mlir::ModuleOp module =
       JsonParser::parse(context, json, inputIds, outputIds, strides);