This is an archive of the discontinued LLVM Phabricator instance.

Differential D126736

TensorFlowCompile: Add object file to list of sources rather than LINK_LIBS
ClosedPublic

Authored by MatzeB on May 31 2022, 5:20 PM.

Details

Reviewers
mtrofin
Commits
rG53753531bc19: TensorFlowCompile: Add object file to list of sources rather than LINK_LIBS
Summary

Put object file with precompiled model into list of source files instead of LINK_LIBS.

Without this I would randomly get compilation failures which I believe stem from a bad ordering of RegallocEvictModel.o and libtf_xla_runtime.a:

/usr/bin/clang++ ... lib/libtf_xla_runtime.a  lib/CodeGen/RegallocEvictModel.o ...
...
lib/CodeGen/RegallocEvictModel.o:__compute_module:function _xla_home_matthiasb_dev_llvm_tfbuild_lib_CodeGen_RegallocEvictModel_llvm_RegallocEvictModel: error: undefined reference to '__xla_cpu_runtime_EigenSingleThreadedMatMulF32'
... other similar errors here ...

specifying the object file in the source file list ensures that it will come before any static libraries.

Diff Detail

Unit TestsFailed

TimeTest
60,060 msx64 debian > MLIR.Examples/standalone::test.toy
39,040 msx64 debian > libFuzzer.libFuzzer::fork_corpus_groups.test
60,040 msx64 debian > libFuzzer.libFuzzer::fuzzer-leak.test

Event Timeline

MatzeB created this revision.May 31 2022, 5:20 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 31 2022, 5:20 PM
Herald added subscribers: modimo, wenlei, mgorny, mcrosier. · View Herald Transcript
MatzeB requested review of this revision.May 31 2022, 5:20 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 31 2022, 5:20 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
MatzeB edited the summary of this revision. (Show Details)May 31 2022, 5:21 PM
mtrofin accepted this revision.May 31 2022, 5:48 PM

lgtm, thanks!

This revision is now accepted and ready to land.May 31 2022, 5:48 PM
Harbormaster completed remote builds in B167165: Diff 433239.May 31 2022, 5:54 PM
This revision was landed with ongoing or failed builds.Jun 1 2022, 9:05 AM
Closed by commit rG53753531bc19: TensorFlowCompile: Add object file to list of sources rather than LINK_LIBS (authored by MatzeB). · Explain Why
This revision was automatically updated to reflect the committed changes.
MatzeB added a commit: rG53753531bc19: TensorFlowCompile: Add object file to list of sources rather than LINK_LIBS.

Revision Contents

PathSize
llvm/
cmake/
modules/
4 lines

Diff 433239

llvm/cmake/modules/TensorFlowCompile.cmake

Show First 20 Lines • Show All 104 Lines • ▼ Show 20 Lines if ("${model}" STREQUAL "autogenerate")
set(model ${default_path}-autogenerated) set(model ${default_path}-autogenerated)
generate_mock_model(${test_model_generator} ${model}) generate_mock_model(${test_model_generator} ${model})
endif() endif()
tf_get_model(${model} LLVM_ML_MODELS_ABSOLUTE) tf_get_model(${model} LLVM_ML_MODELS_ABSOLUTE)
tf_compile(${LLVM_ML_MODELS_ABSOLUTE} ${tag_set} ${signature_def_key} ${fname} ${cpp_class} ${hdr_file} ${obj_file}) tf_compile(${LLVM_ML_MODELS_ABSOLUTE} ${tag_set} ${signature_def_key} ${fname} ${cpp_class} ${hdr_file} ${obj_file})
endif() endif()
set(GeneratedMLSources ${GeneratedMLSources} ${GENERATED_HEADERS} PARENT_SCOPE) set(GeneratedMLSources ${GeneratedMLSources} ${GENERATED_OBJS} ${GENERATED_HEADERS} PARENT_SCOPE)
set(MLDeps ${MLDeps} tf_xla_runtime PARENT_SCOPE) set(MLDeps ${MLDeps} tf_xla_runtime PARENT_SCOPE)
set(MLLinkDeps ${MLLinkDeps} tf_xla_runtime ${GENERATED_OBJS} PARENT_SCOPE) set(MLLinkDeps ${MLLinkDeps} tf_xla_runtime PARENT_SCOPE)
add_definitions(-DLLVM_HAVE_TF_AOT_${fname_allcaps}) add_definitions(-DLLVM_HAVE_TF_AOT_${fname_allcaps})
endfunction() endfunction()