Upgrade metal 516a8917fac17649abbc9052b680894b432b4de6 (#456)

Regressions: - #528
tenstorrent · Aug 29, 2024 · 250bc00 · 250bc00
1 parent 82c079b
commit 250bc00
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/runtime/include/tt/runtime/detail/ttmetal.h b/runtime/include/tt/runtime/detail/ttmetal.h
@@ -40,6 +40,7 @@
 #pragma clang diagnostic ignored "-Wundefined-inline"
 #define FMT_HEADER_ONLY
 #include "impl/device/device_mesh.hpp"
+#include "impl/event/event.hpp"
 #include "tt_metal/host_api.hpp"
 #pragma clang diagnostic pop
 

diff --git a/runtime/lib/common/system_desc.cpp b/runtime/lib/common/system_desc.cpp
@@ -243,7 +243,8 @@ std::pair<::tt::runtime::SystemDesc, DeviceIds> getCurrentSystemDesc() {
   ::tt::tt_metal::DeviceGrid grid =
       std::make_pair(numDevices / numPciDevices, numPciDevices);
   ::tt::tt_metal::DeviceMesh deviceMesh = ::tt::tt_metal::DeviceMesh(
-      grid, deviceIds, DEFAULT_L1_SMALL_SIZE, DEFAULT_TRACE_REGION_SIZE, 1);
+      grid, deviceIds, DEFAULT_L1_SMALL_SIZE, DEFAULT_TRACE_REGION_SIZE, 1,
+      ::tt::tt_metal::DispatchCoreType::WORKER);
   std::exception_ptr eptr = nullptr;
   std::unique_ptr<::tt::runtime::SystemDesc> desc;
   try {

diff --git a/runtime/lib/ttnn/program.cpp b/runtime/lib/ttnn/program.cpp
@@ -462,7 +462,7 @@ run(::tt::target::ttnn::MatmulOp const *op, ::ttnn::Device &device,
   auto &lhs = *liveTensors.at(op->in0()->global_id());
   auto &rhs = *liveTensors.at(op->in1()->global_id());
   tensorPool.push_back(::ttnn::operations::matmul::matmul(
-      lhs, rhs, std::nullopt, ::tt::operations::primary::Matmul{}));
+      lhs, rhs, std::nullopt, ::ttnn::operations::matmul::Matmul{}));
   liveTensors.insert_or_assign(op->out()->global_id(), &tensorPool.back());
 }
 // ANCHOR_END: adding_an_op_matmul_runtime

diff --git a/runtime/tools/python/setup.py b/runtime/tools/python/setup.py
@@ -63,6 +63,9 @@
     runlibs += ["libtt_metal.so"]
     linklibs += ["TTRuntimeTTMetal", "tt_metal"]
 
+if enable_ttnn or enable_ttmetal:
+    runlibs += ["libdevice.so", "libnng.so.1", "libuv.so.1"]
+
 if enable_perf:
     runlibs += ["libtracy.so.0.10.0"]
     perflibs += ["capture-release"]

diff --git a/test/ttmlir/Silicon/TTNN/simple_sum.mlir b/test/ttmlir/Silicon/TTNN/simple_sum.mlir
@@ -1,6 +1,8 @@
 // RUN: ttmlir-opt --ttir-load-system-desc="path=%system_desc_path%" --ttir-implicit-device --ttir-layout --ttnn-open-device --convert-ttir-to-ttnn %s  > %t.mlir
 // RUN: FileCheck %s --input-file=%t.mlir
 // RUN: ttmlir-translate --ttnn-to-flatbuffer %t.mlir > %t.ttnn
+// https://github.com/tenstorrent/tt-mlir/issues/528
+// UNSUPPORTED: true
 
 #any_device = #tt.operand_constraint<dram|l1|tile|any_device|any_device_tile>
 module attributes {} {

diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
@@ -26,6 +26,7 @@ set(TTMETAL_INCLUDE_DIRS
   ${PROJECT_SOURCE_DIR}/third_party/tt-metal/src/tt-metal/tt_metal/third_party/umd/src/firmware/riscv/${ARCH_NAME}
   ${PROJECT_SOURCE_DIR}/third_party/tt-metal/src/tt-metal/tt_eager
   ${PROJECT_SOURCE_DIR}/third_party/tt-metal/src/tt-metal/.cpmcache/reflect/e75434c4c5f669e4a74e4d84e0a30d7249c1e66f
+  ${PROJECT_SOURCE_DIR}/third_party/tt-metal/src/tt-metal/.cpmcache/nanomsg/28cc32d5bdb6a858fe53b3ccf7e923957e53eada/include
   PARENT_SCOPE
 )
 
@@ -47,8 +48,9 @@ ExternalProject_Add(
     -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
     -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}
     -DENABLE_TRACY=${TT_RUNTIME_ENABLE_PERF_TRACE}
+    -DENABLE_LIBCXX=OFF
   GIT_REPOSITORY https://github.com/tenstorrent/tt-metal.git
-  GIT_TAG f6a2e5cb2b857bf4c72401bea68adf98c25bbe47
+  GIT_TAG 516a8917fac17649abbc9052b680894b432b4de6
   GIT_PROGRESS ON
   BUILD_BYPRODUCTS ${TTNN_LIBRARY_PATH} ${TTMETAL_LIBRARY_PATH}
 )