Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#14590: Move sfpi off LFS #14758

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+15 −8
Open

#14590: Move sfpi off LFS #14758

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b34d9b7
#14590: Move sfpi off LFS
nathan-TT Nov 4, 2024
66f7146
#0: Use FetchContent to get SFPI assets
tt-rkim Nov 8, 2024
4e72c89
#0: Update sfpi version
nathan-TT Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "src/ckernels/sfpi"]
path = tt_metal/third_party/sfpi
url = https://github.com/tenstorrent-metal/sfpi-rel-temp.git
[submodule "third_party/pybind11"]
path = tt_metal/third_party/pybind11
url = https://github.com/pybind/pybind11.git
Expand Down
13 changes: 12 additions & 1 deletion tt_metal/hw/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,17 @@ set(TYPES
kernel
)

include(FetchContent)
FetchContent_Declare(
sfpi
URL
https://github.com/tenstorrent/sfpi/releases/download/v0.0.0-lfsectomy/sfpi-release.tgz
URL_HASH MD5=3ffa5a871a6289f19617de7293c1dac0
SOURCE_DIR
${PROJECT_SOURCE_DIR}/runtime/sfpi
)
FetchContent_MakeAvailable(sfpi)

foreach(ARCH IN LISTS ARCHS)
set(DEV_MEM_MAP "${PROJECT_SOURCE_DIR}/tt_metal/hw/inc/${ARCH}/dev_mem_map.h")
set(HW_INCLUDES "${PROJECT_SOURCE_DIR}/tt_metal/hw/inc/${ARCH}")
Expand Down Expand Up @@ -78,7 +89,7 @@ function(get_alias INPUT_STRING OUTPUT_VAR)
endfunction()

# Define the compiler command
set(GPP_CMD ${PROJECT_SOURCE_DIR}/tt_metal/third_party/sfpi/compiler/bin/riscv32-unknown-elf-g++)
set(GPP_CMD ${PROJECT_SOURCE_DIR}/runtime/sfpi/compiler/bin/riscv32-unknown-elf-g++)

set(GPP_DEFINES -DTENSIX_FIRMWARE)

Expand Down
6 changes: 3 additions & 3 deletions tt_metal/jit_build/build.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void JitBuildEnv::init(uint32_t build_key, tt::ARCH arch) {
this->out_kernel_root_ = this->out_root_ + to_string(build_key) + "/kernels/";

// Tools
this->gpp_ = this->root_ + "tt_metal/third_party/sfpi/compiler/bin/riscv32-unknown-elf-g++ ";
this->gpp_ = this->root_ + "runtime/sfpi/compiler/bin/riscv32-unknown-elf-g++ ";

// Flags
string common_flags;
Expand Down Expand Up @@ -291,8 +291,8 @@ JitBuildCompute::JitBuildCompute(const JitBuildEnv& env, const JitBuiltStateConf
env_.root_ + "tt_metal/hw/ckernels/" + env.arch_name_ + "/metal/common " + "-I" + env_.root_ +
"tt_metal/hw/ckernels/" + env.arch_name_ + "/metal/llk_io " + "-I" + env_.root_ +
"tt_metal/hw/ckernels/" + env.arch_name_ + "/metal/llk_api " + "-I" + env_.root_ +
"tt_metal/hw/ckernels/" + env.arch_name_ + "/metal/llk_api/llk_sfpu " + "-I" + env_.root_ +
"tt_metal/third_party/sfpi/include " + "-I" + env_.root_ + "tt_metal/hw/firmware/src " + "-I" +
"tt_metal/hw/ckernels/" + env.arch_name_ + "/metal/llk_api/llk_sfpu " + "-I" +
env_.root_ + "runtime/sfpi/include " + "-I" + env_.root_ + "tt_metal/hw/firmware/src " + "-I" +
env_.root_ + "tt_metal/third_party/tt_llk_" + env.arch_name_ + "/llk_lib ";

if (this->is_fw_) {
Expand Down
1 change: 0 additions & 1 deletion tt_metal/third_party/sfpi
Open in desktop
Submodule sfpi deleted from 1aab81
Loading