Don't use deprecated asmjit templates (#4496)

cyyever · facebook-github-bot · commit 627b5893055d · 2025-07-15T15:30:41.000-07:00
Summary: Pull Request resolved: #4496 X-link: facebookresearch/FBGEMM#1550 Clean up these deprecation warnings before it is possible to build newer asmjit. Pull Request resolved: #4481 Reviewed By: cthi Differential Revision: D78252575 Pulled By: q10 fbshipit-source-id: d9366a8a49d14ae0c05b0ca2b51e6b42ed7faf90
diff --git a/src/EmbeddingSpMDM.cc b/src/EmbeddingSpMDM.cc
@@ -319,7 +319,7 @@ GenEmbeddingSpMDMLookup<
 
         if constexpr (ROWWISE_SPARSE) {
           func.init(
-              asmjit::FuncSignatureT<
+              asmjit::FuncSignature::build<
                   bool,
                   int64_t, // output_size
                   int64_t, // index_size
@@ -334,7 +334,7 @@ GenEmbeddingSpMDMLookup<
               a->environment());
         } else {
           func.init(
-              asmjit::FuncSignatureT<
+              asmjit::FuncSignature::build<
                   bool,
                   int64_t, // output_size
                   int64_t, // index_size
diff --git a/src/EmbeddingSpMDMNBit.cc b/src/EmbeddingSpMDMNBit.cc
@@ -290,7 +290,7 @@ GenEmbeddingSpMDMNBitLookup<
 
         if constexpr (ROWWISE_SPARSE) {
           func.init(
-              asmjit::FuncSignatureT<
+              asmjit::FuncSignature::build<
                   bool,
                   int64_t, // output_size
                   int64_t, // index_size
@@ -305,7 +305,7 @@ GenEmbeddingSpMDMNBitLookup<
               a->environment());
         } else {
           func.init(
-              asmjit::FuncSignatureT<
+              asmjit::FuncSignature::build<
                   bool,
                   int64_t, // output_size
                   int64_t, // index_size
diff --git a/src/FbgemmI64.cc b/src/FbgemmI64.cc
@@ -178,14 +178,9 @@ CodeGenBase<int64_t, int64_t, int64_t, int64_t>::getOrCreate(
 
     asmjit::FuncDetail func;
     func.init(
-        asmjit::FuncSignatureT<
-            void,
-            int64_t*,
-            int64_t*,
-            int64_t*,
-            int64_t*,
-            int,
-            int>(asmjit::CallConvId::kHost),
+        asmjit::FuncSignature::
+            build<void, int64_t*, int64_t*, int64_t*, int64_t*, int, int>(
+                asmjit::CallConvId::kHost),
         a->environment());
 
     asmjit::FuncFrame frame;
diff --git a/src/GenerateI8Depthwise.cc b/src/GenerateI8Depthwise.cc
@@ -262,7 +262,7 @@ GenI8Depthwise::jit_kernel_signature GenI8Depthwise::getOrCreate(
 
     asmjit::FuncDetail func;
     func.init(
-        asmjit::FuncSignatureT<
+        asmjit::FuncSignature::build<
             void,
             const std::uint8_t*,
             const std::int8_t*,
diff --git a/src/GenerateKernelDirectConvU8S8S32ACC32.cc b/src/GenerateKernelDirectConvU8S8S32ACC32.cc
@@ -226,14 +226,9 @@ DirectConvCodeGenBase<uint8_t, int8_t, int32_t, int32_t>::getOrCreateDirectConv(
 
     asmjit::FuncDetail func;
     func.init(
-        asmjit::FuncSignatureT<
-            void,
-            uint8_t*,
-            int8_t*,
-            int8_t*,
-            int32_t*,
-            int,
-            int>(asmjit::CallConvId::kHost),
+        asmjit::FuncSignature::
+            build<void, uint8_t*, int8_t*, int8_t*, int32_t*, int, int>(
+                asmjit::CallConvId::kHost),
         a->environment());
 
     asmjit::FuncFrame frame;
@@ -650,15 +645,9 @@ DirectConvCodeGenBase<uint8_t, int8_t, int32_t, int32_t>::
 
     asmjit::FuncDetail func;
     func.init(
-        asmjit::FuncSignatureT<
-            void,
-            uint8_t*,
-            int8_t*,
-            int32_t*,
-            int,
-            int,
-            int,
-            int>(asmjit::CallConvId::kHost),
+        asmjit::FuncSignature::
+            build<void, uint8_t*, int8_t*, int32_t*, int, int, int, int>(
+                asmjit::CallConvId::kHost),
         a->environment());
 
     asmjit::FuncFrame frame;
diff --git a/src/GenerateKernelU8S8S32ACC16.cc b/src/GenerateKernelU8S8S32ACC16.cc
@@ -180,14 +180,9 @@ CodeGenBase<uint8_t, int8_t, int32_t, int16_t>::getOrCreate<inst_set_t::avx2>(
 
     asmjit::FuncDetail func;
     func.init(
-        asmjit::FuncSignatureT<
-            void,
-            uint8_t*,
-            int8_t*,
-            int8_t*,
-            int32_t*,
-            int,
-            int>(asmjit::CallConvId::kHost),
+        asmjit::FuncSignature::
+            build<void, uint8_t*, int8_t*, int8_t*, int32_t*, int, int>(
+                asmjit::CallConvId::kHost),
         a->environment());
 
     asmjit::FuncFrame frame;
diff --git a/src/GenerateKernelU8S8S32ACC16Avx512.cc b/src/GenerateKernelU8S8S32ACC16Avx512.cc
@@ -142,14 +142,9 @@ CodeGenBase<uint8_t, int8_t, int32_t, int16_t>::getOrCreate(
 
     asmjit::FuncDetail func;
     func.init(
-        asmjit::FuncSignatureT<
-            void,
-            uint8_t*,
-            int8_t*,
-            int8_t*,
-            int32_t*,
-            int,
-            int>(asmjit::CallConvId::kHost),
+        asmjit::FuncSignature::
+            build<void, uint8_t*, int8_t*, int8_t*, int32_t*, int, int>(
+                asmjit::CallConvId::kHost),
         a->environment());
 
     asmjit::FuncFrame frame;
diff --git a/src/GenerateKernelU8S8S32ACC32.cc b/src/GenerateKernelU8S8S32ACC32.cc
@@ -179,14 +179,9 @@ CodeGenBase<uint8_t, int8_t, int32_t, int32_t>::getOrCreate(
 
     asmjit::FuncDetail func;
     func.init(
-        asmjit::FuncSignatureT<
-            void,
-            uint8_t*,
-            int8_t*,
-            int8_t*,
-            int32_t*,
-            int,
-            int>(asmjit::CallConvId::kHost),
+        asmjit::FuncSignature::
+            build<void, uint8_t*, int8_t*, int8_t*, int32_t*, int, int>(
+                asmjit::CallConvId::kHost),
         a->environment());
 
     asmjit::FuncFrame frame;
diff --git a/src/GenerateKernelU8S8S32ACC32Avx512VNNI.cc b/src/GenerateKernelU8S8S32ACC32Avx512VNNI.cc
@@ -133,14 +133,9 @@ CodeGenBase<uint8_t, int8_t, int32_t, int32_t>::getOrCreate(
 
     asmjit::FuncDetail func;
     func.init(
-        asmjit::FuncSignatureT<
-            void,
-            uint8_t*,
-            int8_t*,
-            int8_t*,
-            int32_t*,
-            int,
-            int>(asmjit::CallConvId::kHost),
+        asmjit::FuncSignature::
+            build<void, uint8_t*, int8_t*, int8_t*, int32_t*, int, int>(
+                asmjit::CallConvId::kHost),
         a->environment());
 
     asmjit::FuncFrame frame;
diff --git a/src/GroupwiseConv.cc b/src/GroupwiseConv.cc
@@ -217,7 +217,7 @@ jit_conv_kernel_fp GenConvKernel<SPATIAL_DIM, INST_SET>::getOrCreate() {
   scratchReg2_ = a->gpz(13);
 
   func_.init(
-      asmjit::FuncSignatureT<
+      asmjit::FuncSignature::build<
           void,
           uint8_t*,
           int8_t*,
diff --git a/src/RowWiseSparseAdagradFused.cc b/src/RowWiseSparseAdagradFused.cc
@@ -168,7 +168,7 @@ typename ReturnFunctionSignature<indxType, offsetType, dataType>::
 
         asmjit::FuncDetail func;
         func.init(
-            asmjit::FuncSignatureT<
+            asmjit::FuncSignature::build<
                 bool, // return type
                 int64_t, // output_size
                 int64_t, // index_size
diff --git a/src/SparseAdagrad.cc b/src/SparseAdagrad.cc
@@ -500,7 +500,7 @@ GenSparseAdagrad<indxType, instSet>::getOrCreate(
 
         asmjit::FuncDetail func;
         func.init(
-            asmjit::FuncSignatureT<
+            asmjit::FuncSignature::build<
                 int, // return type
                 int, // num rows
                 std::uint64_t, // param_size
diff --git a/test/EmbeddingSpMDM8BitTest.cc b/test/EmbeddingSpMDM8BitTest.cc
@@ -58,7 +58,7 @@ class Fused8BitRowwiseEmbeddingLookupTest
           EmbeddingSpMDMOutputDtypeChoice>> {};
 }; // namespace
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     Fused8BitRowwiseEmbeddingLookupTest,
     ::testing::Combine(
diff --git a/test/EmbeddingSpMDMNBitTest.cc b/test/EmbeddingSpMDMNBitTest.cc
@@ -61,7 +61,7 @@ class FusedNBitRowwiseEmbeddingLookupTest : public testing::TestWithParam<tuple<
                                                 EmbeddingSpMDMDtypeChoice>> {};
 }; // namespace
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FusedNBitRowwiseEmbeddingLookupTest,
     ::testing::Combine(
diff --git a/test/EmbeddingSpMDMTest.cc b/test/EmbeddingSpMDMTest.cc
@@ -67,7 +67,7 @@ class IndexRemapTest
 
 static vector<int> prefetch_distances = {0, 16, 1000000};
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     EmbeddingSpMDMTest,
     ::testing::Combine(
@@ -84,7 +84,7 @@ INSTANTIATE_TEST_CASE_P(
         ::testing::Values(FLOAT, FLOAT16, BFLOAT16),
         ::testing::Values(FLOAT, FLOAT16, BFLOAT16)));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     rowwiseSparseEmbeddingSpMDMTest,
     ::testing::Combine(
@@ -99,7 +99,7 @@ INSTANTIATE_TEST_CASE_P(
             OUT_OF_BOUND_INDICES,
             UNMATCHED_NUM_INDICES_AND_LENGTHS_SUM)));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     IndexRemapTest,
     ::testing::Combine(
diff --git a/test/FP16Test.cc b/test/FP16Test.cc
@@ -13,7 +13,7 @@
 
 using FBGemmFP16Test = fbgemm::FBGemmFPTest<fbgemm::float16>;
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FBGemmFP16Test,
     ::testing::Values(
diff --git a/test/FP32Test.cc b/test/FP32Test.cc
@@ -20,7 +20,7 @@
 
 using FBGemmFP32Test = fbgemm::FBGemmFPTest<float>;
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FBGemmFP32Test,
     ::testing::Values(
diff --git a/test/Float16ConvertTest.cc b/test/Float16ConvertTest.cc
@@ -21,7 +21,7 @@ namespace {
 class FBGemmFloat16Test : public testing::TestWithParam<bool> {};
 }; // namespace
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FBGemmFloat16Test,
     ::testing::Bool());
diff --git a/test/GConvTest.cc b/test/GConvTest.cc
@@ -49,14 +49,14 @@ class fbgemmGConvAcc32WithQuantGranularityTest
 class fbgemmGConvPackTest : public testing::TestWithParam<matrix_op_t> {};
 }; // namespace
 
-// INSTANTIATE_TEST_CASE_P(
+// INSTANTIATE_TEST_SUITE_P(
 //     InstantiationName,
 //     fbgemmGConvAcc32Test,
 //     ::testing::Combine(
 //         ::testing::Values(matrix_op_t::NoTranspose),
 //         ::testing::ValuesIn(transposeVals)));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     fbgemmGConvAcc32WithQuantGranularityTest,
     ::testing::Combine(
@@ -66,7 +66,7 @@ INSTANTIATE_TEST_CASE_P(
         ::testing::Bool(), // A symmetric
         ::testing::Bool())); // B symmetric
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     fbgemmGConvPackTest,
     ::testing::ValuesIn(transposeVals));
diff --git a/test/I8DepthwiseTest.cc b/test/I8DepthwiseTest.cc
@@ -107,20 +107,20 @@ class FBGemmDepthWisePackUnpackTest
 
 } // namespace
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FBGemmDepthWiseTest,
     ::testing::Combine(
         ::testing::Bool(), // a_symmetric
         ::testing::Bool(), // b_symmetric
         ::testing::Values(1, 2))); // oc_per_g
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FBGemmDepthWisePerChannelQuantizationTest,
     ::testing::Values(1, 2));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FBGemmDepthWisePackUnpackTest,
     ::testing::Combine(
diff --git a/test/I8DirectconvTest.cc b/test/I8DirectconvTest.cc
@@ -248,7 +248,7 @@ static void QuantizeDirectConv_ref(
   }
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FBGemmDirectConvTest,
     ::testing::Combine(
@@ -418,7 +418,7 @@ TEST_P(FBGemmDirectConvTest, Test2D) {
 */
 
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FBGemmDirectConvTransTest,
     ::testing::Combine(
@@ -606,7 +606,7 @@ TEST_P(FBGemmDirectConvTransTest, Test2D) {
 }
 
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FBGemmDirectConvTransFbgemmTest,
     ::testing::Combine(
diff --git a/test/I8SpmdmTest.cc b/test/I8SpmdmTest.cc
@@ -35,7 +35,7 @@ class fbgemmSPMDMTest
     : public testing::TestWithParam<std::tuple<float, bool, bool>> {};
 } // namespace
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     Instance0,
     fbgemmSPMDMTest,
     ::testing::Combine(
diff --git a/test/Im2ColFusedRequantizeTest.cc b/test/Im2ColFusedRequantizeTest.cc
@@ -36,7 +36,7 @@ class fbgemmIm2colTest
     : public testing::TestWithParam<tuple<QuantizationGranularity, bool>> {};
 }; // namespace
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     fbgemmIm2colTest,
     ::testing::Combine(
diff --git a/test/PackedRequantizeAcc16Test.cc b/test/PackedRequantizeAcc16Test.cc
@@ -48,7 +48,7 @@ class fbgemmPackUnpackAcc16Test
     : public testing::TestWithParam<tuple<matrix_op_t, bool>> {};
 }; // namespace
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     fbgemmu8s8acc16WithQuantGranularityTest,
     ::testing::Combine(
@@ -57,15 +57,15 @@ INSTANTIATE_TEST_CASE_P(
         ::testing::Bool(),
         ::testing::ValuesIn(qGranularityVals)));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     fbgemmu8s8acc16Test,
     ::testing::Combine(
         ::testing::Values(matrix_op_t::NoTranspose),
         ::testing::ValuesIn(transposeVals),
         ::testing::Bool()));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     fbgemmPackUnpackAcc16Test,
     ::testing::Combine(::testing::ValuesIn(transposeVals), ::testing::Bool()));
diff --git a/test/PackedRequantizeTest.cc b/test/PackedRequantizeTest.cc
diff --git a/test/QuantUtilsTest.cc b/test/QuantUtilsTest.cc
diff --git a/test/RequantizeOnlyTest.cc b/test/RequantizeOnlyTest.cc
diff --git a/test/RowWiseSparseAdagradFusedTest.cc b/test/RowWiseSparseAdagradFusedTest.cc
diff --git a/test/SparseAdagradTest.cc b/test/SparseAdagradTest.cc
diff --git a/test/SparseDenseMMInt8Test.cc b/test/SparseDenseMMInt8Test.cc
diff --git a/test/SparsePackUnpackTest.cc b/test/SparsePackUnpackTest.cc
diff --git a/test/TransposedRequantizeTest.cc b/test/TransposedRequantizeTest.cc
diff --git a/test/UniConvTest.cc b/test/UniConvTest.cc
