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.

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

Update submodule asmjit #520

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/EmbeddingSpMDM.cc
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ GenEmbeddingSpMDMLookup<inType, indxType, offsetType, instSet, ROWWISE_SPARSE>::
bool areIndices64b = std::is_same<indxType, std::int64_t>::value;

asmjit::CodeHolder code;
code.init(runtime().codeInfo());
code.init(runtime().environment());
x86::Assembler assembler(&code);
x86::Emitter* a = assembler.as<x86::Emitter>();
#if defined(FBGEMM_LOG_CODE)
Expand Down Expand Up @@ -264,7 +264,7 @@ GenEmbeddingSpMDMLookup<inType, indxType, offsetType, instSet, ROWWISE_SPARSE>::
const float*, // weights
float*, // out
const std::int32_t*, // compressed_indices_table and then mask
const int*>(asmjit::CallConv::kIdHost));
const int*>(asmjit::CallConv::kIdHost), a->environment());
} else {
func.init(asmjit::FuncSignatureT<
bool,
Expand All @@ -276,7 +276,7 @@ GenEmbeddingSpMDMLookup<inType, indxType, offsetType, instSet, ROWWISE_SPARSE>::
const offsetType*, // offsets or lengths
const float*, // weights
float*, // out and then mask
const int*>(asmjit::CallConv::kIdHost));
const int*>(asmjit::CallConv::kIdHost), a->environment());
}

asmjit::FuncFrame frame;
Expand Down
6 changes: 3 additions & 3 deletions src/EmbeddingSpMDMNBit.cc
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ typename ReturnFunctionSignature<indxType, offsetType, ROWWISE_SPARSE>::
bool areIndices64b = is_same<indxType, int64_t>::value;

asmjit::CodeHolder code;
code.init(runtime().codeInfo());
code.init(runtime().environment());
x86::Assembler assembler(&code);
x86::Emitter* a = assembler.as<x86::Emitter>();
#if defined(FBGEMM_LOG_CODE)
Expand Down Expand Up @@ -245,7 +245,7 @@ typename ReturnFunctionSignature<indxType, offsetType, ROWWISE_SPARSE>::
const float*, // weights
float*, // out
const int32_t* /* compressed_indices_table */,
const int* /* mask */>(asmjit::CallConv::kIdHost));
const int* /* mask */>(asmjit::CallConv::kIdHost), a->environment());
} else {
func.init(asmjit::FuncSignatureT<
bool,
Expand All @@ -257,7 +257,7 @@ typename ReturnFunctionSignature<indxType, offsetType, ROWWISE_SPARSE>::
const offsetType*, // offsets or lengths
const float*, // weights
float*, // out
const int* /* mask */>(asmjit::CallConv::kIdHost));
const int* /* mask */>(asmjit::CallConv::kIdHost), a->environment());
}

asmjit::FuncFrame frame;
Expand Down
4 changes: 2 additions & 2 deletions src/FbgemmI64.cc
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ CodeGenBase<int64_t, int64_t, int64_t, int64_t>::getOrCreate(

return codeCache_.getOrCreate(kernelSig, [&]() -> jit_micro_kernel_fp {
asmjit::CodeHolder code;
code.init(runtime().codeInfo());
code.init(runtime().environment());
x86::Assembler assembler(&code);
x86::Emitter* a = assembler.as<x86::Emitter>();
#ifdef FBGEMM_LOG_CODE
Expand Down Expand Up @@ -180,7 +180,7 @@ CodeGenBase<int64_t, int64_t, int64_t, int64_t>::getOrCreate(
int64_t*,
int64_t*,
int,
int>(asmjit::CallConv::kIdHost));
int>(asmjit::CallConv::kIdHost), a->environment());

asmjit::FuncFrame frame;
frame.init(func);
Expand Down
4 changes: 2 additions & 2 deletions src/GenerateI8Depthwise.cc
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ GenI8Depthwise::jit_kernel_signature GenI8Depthwise::getOrCreate(

return codeCache_.getOrCreate(kernelSig, [&]() -> jit_kernel_signature {
asmjit::CodeHolder code;
code.init(runtime().codeInfo());
code.init(runtime().environment());
x86::Assembler assembler(&code);
x86::Emitter* e = assembler.as<x86::Emitter>();
#ifdef FBGEMM_LOG_CODE
Expand Down Expand Up @@ -270,7 +270,7 @@ GenI8Depthwise::jit_kernel_signature GenI8Depthwise::getOrCreate(
int,
const int*,
int,
const std::int32_t*>(asmjit::CallConv::kIdHost));
const std::int32_t*>(asmjit::CallConv::kIdHost), e->environment());

asmjit::FuncFrame frame;
frame.init(func);
Expand Down
4 changes: 2 additions & 2 deletions src/GenerateKernelU8S8S32ACC16.cc
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ getOrCreate<inst_set_t::avx2>(

return codeCache_.getOrCreate(kernelSig, [&]() -> jit_micro_kernel_fp {
asmjit::CodeHolder code;
code.init(runtime().codeInfo());
code.init(runtime().environment());
x86::Assembler assembler(&code);
x86::Emitter* a = assembler.as<x86::Emitter>();

Expand Down Expand Up @@ -189,7 +189,7 @@ getOrCreate<inst_set_t::avx2>(
int8_t*,
int32_t*,
int,
int>(asmjit::CallConv::kIdHost));
int>(asmjit::CallConv::kIdHost), a->environment());

asmjit::FuncFrame frame;
frame.init(func);
Expand Down
4 changes: 2 additions & 2 deletions src/GenerateKernelU8S8S32ACC16Avx512.cc
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ CodeGenBase<uint8_t, int8_t, int32_t, int16_t>::getOrCreate(

return codeCache_.getOrCreate(kernelSig, [&]() -> jit_micro_kernel_fp {
asmjit::CodeHolder code;
code.init(runtime().codeInfo());
code.init(runtime().environment());
x86::Assembler assembler(&code);
x86::Emitter* a = assembler.as<x86::Emitter>();

Expand Down Expand Up @@ -152,7 +152,7 @@ CodeGenBase<uint8_t, int8_t, int32_t, int16_t>::getOrCreate(
int8_t*,
int32_t*,
int,
int>(asmjit::CallConv::kIdHost));
int>(asmjit::CallConv::kIdHost), a->environment());

asmjit::FuncFrame frame;
frame.init(func);
Expand Down
4 changes: 2 additions & 2 deletions src/GenerateKernelU8S8S32ACC32.cc
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ CodeGenBase<uint8_t, int8_t, int32_t, int32_t>::getOrCreate(

return codeCache_.getOrCreate(kernelSig, [&]() -> jit_micro_kernel_fp {
asmjit::CodeHolder code;
code.init(runtime().codeInfo());
code.init(runtime().environment());
x86::Assembler assembler(&code);
x86::Emitter* a = assembler.as<x86::Emitter>();
#if defined(FBGEMM_LOG_CODE)
Expand Down Expand Up @@ -186,7 +186,7 @@ CodeGenBase<uint8_t, int8_t, int32_t, int32_t>::getOrCreate(
int8_t*,
int32_t*,
int,
int>(asmjit::CallConv::kIdHost));
int>(asmjit::CallConv::kIdHost), a->environment());

asmjit::FuncFrame frame;
frame.init(func);
Expand Down
4 changes: 2 additions & 2 deletions src/GenerateKernelU8S8S32ACC32Avx512VNNI.cc
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ CodeGenBase<uint8_t, int8_t, int32_t, int32_t>::getOrCreate(

return codeCache_.getOrCreate(kernelSig, [&]() -> jit_micro_kernel_fp {
asmjit::CodeHolder code;
code.init(runtime().codeInfo());
code.init(runtime().environment());
x86::Assembler assembler(&code);
x86::Emitter* a = assembler.as<x86::Emitter>();

Expand Down Expand Up @@ -134,7 +134,7 @@ CodeGenBase<uint8_t, int8_t, int32_t, int32_t>::getOrCreate(
int8_t*,
int32_t*,
int,
int>(asmjit::CallConv::kIdHost));
int>(asmjit::CallConv::kIdHost), a->environment());

asmjit::FuncFrame frame;
frame.init(func);
Expand Down
4 changes: 2 additions & 2 deletions src/GroupwiseConv.cc
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ jit_conv_kernel_fp getOrCreateConvKernel(
template <int SPATIAL_DIM, inst_set_t INST_SET>
jit_conv_kernel_fp GenConvKernel<SPATIAL_DIM, INST_SET>::getOrCreate() {
asmjit::CodeHolder code;
code.init(this->runtime().codeInfo());
code.init(this->runtime().environment());
x86::Assembler assembler(&code);
x86::Emitter* a = assembler.as<x86::Emitter>();

Expand Down Expand Up @@ -224,7 +224,7 @@ jit_conv_kernel_fp GenConvKernel<SPATIAL_DIM, INST_SET>::getOrCreate() {
int32_t,
int32_t,
int32_t,
int32_t*>(asmjit::CallConv::kIdHost));
int32_t*>(asmjit::CallConv::kIdHost), a->environment());

frame_.init(func_);

Expand Down
4 changes: 2 additions & 2 deletions src/RowWiseSparseAdagradFused.cc
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ typename ReturnFunctionSignature<indxType, offsetType, dataType>::
offsetType,
dataType>::jit_sparse_adagrad_kernel {
asmjit::CodeHolder code;
code.init(runtime().codeInfo());
code.init(runtime().environment());
x86::Assembler assembler(&code);
x86::Emitter* a = assembler.as<x86::Emitter>();
bool areIndices64b = is_same<indxType, int64_t>::value;
Expand Down Expand Up @@ -169,7 +169,7 @@ typename ReturnFunctionSignature<indxType, offsetType, dataType>::
const int*, // lengths
float, // epsilon
float, // lr then rand_buffer
uint32_t*>(asmjit::CallConv::kIdHost));
uint32_t*>(asmjit::CallConv::kIdHost), a->environment());

asmjit::FuncFrame frame;
frame.init(func);
Expand Down
4 changes: 2 additions & 2 deletions src/SparseAdagrad.cc
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ GenSparseAdagrad<indxType, instSet>::getOrCreate(
[&]() ->
typename ReturnFunctionSignature<indxType>::jit_sparse_adagrad_kernel {
asmjit::CodeHolder code;
code.init(runtime().codeInfo());
code.init(runtime().environment());
x86::Assembler assembler(&code);
x86::Emitter* a = assembler.as<x86::Emitter>();
bool areIndices64b = std::is_same<indxType, std::int64_t>::value;
Expand Down Expand Up @@ -509,7 +509,7 @@ GenSparseAdagrad<indxType, instSet>::getOrCreate(
const int*, // mask_avx2
float, // weight_decay
const double*, // counter then counter_halflife
std::int64_t>(asmjit::CallConv::kIdHost));
std::int64_t>(asmjit::CallConv::kIdHost), a->environment());

asmjit::FuncFrame frame;
frame.init(func);
Expand Down
2 changes: 1 addition & 1 deletion third_party/asmjit
Submodule asmjit updated 165 files