From 707d080b4b7c4a0c5593095eda498ba365273dd5 Mon Sep 17 00:00:00 2001 From: KONNO Kazuhiro Date: Tue, 12 Nov 2024 16:19:21 +0900 Subject: [PATCH] Stop recognizing UTF16_Encoder.encodeUTF16 methods This commit removes the code for encodeUTF16Big() and encodeUTF16Little() methods in sun.nio.cs.UTF16_Encoder from method recognition, and removes related helper functions. --- compiler/codegen/OMRCodeGenerator.hpp | 3 - compiler/control/OMROptions.cpp | 3 - compiler/control/OMROptions.hpp | 6 +- compiler/optimizer/ValuePropagationCommon.cpp | 59 ++----------------- compiler/p/codegen/OMRCodeGenerator.cpp | 14 ----- compiler/p/codegen/OMRCodeGenerator.hpp | 4 -- compiler/ras/Debug.cpp | 3 - compiler/runtime/Helpers.inc | 38 +++++------- compiler/x/codegen/OMRCodeGenerator.cpp | 16 ----- compiler/x/codegen/OMRCodeGenerator.hpp | 3 - compiler/z/codegen/OMRCodeGenerator.cpp | 14 ----- compiler/z/codegen/OMRCodeGenerator.hpp | 2 - 12 files changed, 25 insertions(+), 140 deletions(-) diff --git a/compiler/codegen/OMRCodeGenerator.hpp b/compiler/codegen/OMRCodeGenerator.hpp index 755538f3de5..c788b610466 100644 --- a/compiler/codegen/OMRCodeGenerator.hpp +++ b/compiler/codegen/OMRCodeGenerator.hpp @@ -1685,9 +1685,6 @@ class OMR_EXTENSIBLE CodeGenerator bool getSupportsArrayTranslateTROT() {return _flags4.testAny(SupportsArrayTranslateTROT);} void setSupportsArrayTranslateTROT() {_flags4.set(SupportsArrayTranslateTROT);} - bool getSupportsEncodeUtf16LittleWithSurrogateTest() { return false; } - bool getSupportsEncodeUtf16BigWithSurrogateTest() { return false; } - bool getSupportsArraySet() {return _flags1.testAny(SupportsArraySet);} void setSupportsArraySet() {_flags1.set(SupportsArraySet);} diff --git a/compiler/control/OMROptions.cpp b/compiler/control/OMROptions.cpp index da7195439d0..ffec3b01b8c 100644 --- a/compiler/control/OMROptions.cpp +++ b/compiler/control/OMROptions.cpp @@ -551,8 +551,6 @@ TR::OptionTable OMR::Options::_jitOptions[] = { {"disableSIMDArrayTranslate", "O\tdisable SIMD instructions for array translate", SET_OPTION_BIT(TR_DisableSIMDArrayTranslate), "F"}, {"disableSIMDDoubleMaxMin", "O\tdisable SIMD instructions for double max min", SET_OPTION_BIT(TR_DisableSIMDDoubleMaxMin), "F"}, {"disableSIMDStringHashCode", "O\tdisable vectorized java/lang/String.hashCode implementation", SET_OPTION_BIT(TR_DisableSIMDStringHashCode), "F"}, - {"disableSIMDUTF16BEEncoder", "M\tdisable inlining of SIMD UTF16 Big Endian encoder", SET_OPTION_BIT(TR_DisableSIMDUTF16BEEncoder), "F"}, - {"disableSIMDUTF16LEEncoder", "M\tdisable inlining of SIMD UTF16 Little Endian encoder", SET_OPTION_BIT(TR_DisableSIMDUTF16LEEncoder), "F"}, {"disableSmartPlacementOfCodeCaches", "O\tdisable placement of code caches in memory so they are near each other and the DLLs", SET_OPTION_BIT(TR_DisableSmartPlacementOfCodeCaches), "F", NOT_IN_SUBSET}, {"disableStableAnnotations", "M\tdisable recognition of @Stable", SET_OPTION_BIT(TR_DisableStableAnnotations), "F"}, {"disableStaticFinalFieldFolding", "O\tdisable generic static final field folding", TR::Options::disableOptimization, staticFinalFieldFolding, 0, "P"}, @@ -595,7 +593,6 @@ TR::OptionTable OMR::Options::_jitOptions[] = { {"disableUpgradingColdCompilations", "R\tdisable upgrading to warm those methods compiled at cold due to classLoadPhase", SET_OPTION_BIT(TR_DisableUpgradingColdCompilations), "F", NOT_IN_SUBSET}, {"disableUseDefForShadows", "I\ttemporary, disables usedef for shadows.", SET_OPTION_BIT(TR_DisableUseDefForShadows),"F"}, {"disableUseRIOnlyForLargeQSZ", "M\t", RESET_OPTION_BIT(TR_UseRIOnlyForLargeQSZ), "F", NOT_IN_SUBSET }, - {"disableUTF16BEEncoder", "M\tdisable inlining of UTF16 Big Endian encoder", SET_OPTION_BIT(TR_DisableUTF16BEEncoder), "F"}, {"disableValueProfiling", "O\tdisable value profiling", SET_OPTION_BIT(TR_DisableValueProfiling), "F"}, {"disableVariablePrecisionDAA", "O\tdisable variable precision DAA optimizations", SET_OPTION_BIT(TR_DisableVariablePrecisionDAA), "F"}, {"disableVectorAPIExpansion", "M\tdisable expansion of Vector API", SET_OPTION_BIT(TR_DisableVectorAPIExpansion), "F"}, diff --git a/compiler/control/OMROptions.hpp b/compiler/control/OMROptions.hpp index bd4020cee75..9b5fa2c6fd0 100644 --- a/compiler/control/OMROptions.hpp +++ b/compiler/control/OMROptions.hpp @@ -880,14 +880,14 @@ enum TR_CompilationOptions TR_DisableSIMD = 0x00010000 + 27, // Available = 0x00020000 + 27, TR_DisableSIMDStringCaseConv = 0x00040000 + 27, - TR_DisableSIMDUTF16BEEncoder = 0x00080000 + 27, + // Available = 0x00080000 + 27, TR_DisableSIMDArrayCopy = 0x00100000 + 27, TR_CheckStructureDuringExitExtraction = 0x00200000 + 27, TR_EnableRMODE64 = 0x00400000 + 27, TR_EnableLocalVPSkipLowFreqBlock = 0x00800000 + 27, TR_DisableLastITableCache = 0x01000000 + 27, TR_StressTrampolines = 0x02000000 + 27, - TR_DisableSIMDUTF16LEEncoder = 0x04000000 + 27, + // Available = 0x04000000 + 27, TR_DisableExitExtraction = 0x08000000 + 27, TR_TraceExitExtraction = 0x10000000 + 27, TR_VaryInlinerAggressivenessWithTime = 0x20000000 + 27, @@ -907,7 +907,7 @@ enum TR_CompilationOptions TR_DisableInvariantCodeMotion = 0x00008000 + 28, TR_EnableSelfTuningScratchMemoryUsageBeforeCompile = 0x00010000 + 28, TR_EnableSelfTuningScratchMemoryUsageInTrMemory = 0x00020000 + 28, - TR_DisableUTF16BEEncoder = 0x00040000 + 28, + // Available = 0x00040000 + 28, // Available = 0x00080000 + 28, TR_DisableDAATrailingZero = 0x00100000 + 28, TR_DisableDynamicRIBufferProcessing = 0x00200000 + 28, diff --git a/compiler/optimizer/ValuePropagationCommon.cpp b/compiler/optimizer/ValuePropagationCommon.cpp index 34b768c060c..d32b9ab91ad 100644 --- a/compiler/optimizer/ValuePropagationCommon.cpp +++ b/compiler/optimizer/ValuePropagationCommon.cpp @@ -2407,8 +2407,6 @@ void OMR::ValuePropagation::generateArrayTranslateNode(TR::TreeTop *callTree,TR: bool isISO88591Decoder = (rm == TR::sun_nio_cs_ISO_8859_1_Decoder_decodeISO8859_1); bool isSBCSEncoder = (rm == TR::sun_nio_cs_ext_SBCS_Encoder_encodeSBCS)? true:false; bool isSBCSDecoder = (rm == TR::sun_nio_cs_ext_SBCS_Decoder_decodeSBCS)? true:false; - bool isEncodeUtf16 = (rm == TR::sun_nio_cs_UTF_16_Encoder_encodeUTF16Big || rm == TR::sun_nio_cs_UTF_16_Encoder_encodeUTF16Little); - int32_t childId = callNode->getFirstArgumentIndex(); if (callNode->getChild(childId)->getType().isAddress() && callNode->getChild(childId+1)->getType().isAddress()) @@ -2471,7 +2469,7 @@ void OMR::ValuePropagation::generateArrayTranslateNode(TR::TreeTop *callTree,TR: else strideNode = TR::Node::create(callNode, TR::iconst, 0, 2); - if ( isISO88591Encoder || isAsciiEncoder || isSBCSEncoder || isEncodeUtf16 || + if ( isISO88591Encoder || isAsciiEncoder || isSBCSEncoder || (rm == TR::sun_nio_cs_US_ASCII_Encoder_encodeASCII) || (rm == TR::sun_nio_cs_UTF_8_Encoder_encodeUTF_8)) encode = true; @@ -2626,36 +2624,12 @@ void OMR::ValuePropagation::generateArrayTranslateNode(TR::TreeTop *callTree,TR: stoppingNode = TR::Node::create(callNode,TR::iconst, 0, stopIndex); - if (isEncodeUtf16) - { - TR::SymbolReference* transformedCallSymRef = - comp()->getSymRefTab()->methodSymRefFromName( - comp()->getMethodSymbol(), - "com/ibm/jit/JITHelpers", - TR::sun_nio_cs_UTF_16_Encoder_encodeUTF16Big == rm ? - "transformedEncodeUTF16Big" : - "transformedEncodeUTF16Little", - "(JJI)I", - TR::MethodSymbol::Static - ); - - arrayTranslateNode = TR::Node::createWithSymRef(callNode, callNode->getOpCodeValue(), 3, transformedCallSymRef); - } - arrayTranslateNode->setAndIncChild(0, src); arrayTranslateNode->setAndIncChild(1, dst); - - if (isEncodeUtf16) - { - arrayTranslateNode->setAndIncChild(2, len); - } - else - { - arrayTranslateNode->setAndIncChild(2, tableNode); - arrayTranslateNode->setAndIncChild(3, termCharNode); - arrayTranslateNode->setAndIncChild(4, len); - arrayTranslateNode->setAndIncChild(5, stoppingNode); - } + arrayTranslateNode->setAndIncChild(2, tableNode); + arrayTranslateNode->setAndIncChild(3, termCharNode); + arrayTranslateNode->setAndIncChild(4, len); + arrayTranslateNode->setAndIncChild(5, stoppingNode); //arrayTranslateNode->setChild(5, NULL);//* do I need this? what if there are more children?*/ @@ -3936,29 +3910,8 @@ slowBlock-> n39n BBStart (freq 0) (cold) cfg->addEdge(TR::CFGEdge::createEdge(prevBlock, slowBlock, trMemory())); cfg->addEdge(TR::CFGEdge::createEdge(slowBlock, nextBlock, trMemory())); } -#endif -static -const char* transformedTargetName (TR::RecognizedMethod rm) - { -#ifdef J9_PROJECT_SPECIFIC - switch ( rm ) - { - case TR::sun_nio_cs_UTF_16_Encoder_encodeUTF16Big: - return "icall com/ibm/jit/JITHelpers.transformedEncodeUTF16Big(JJI)I"; - - case TR::sun_nio_cs_UTF_16_Encoder_encodeUTF16Little: - return "icall com/ibm/jit/JITHelpers.transformedEncodeUTF16Little(JJI)I" ; - default: - return "arraytranslate"; - } -#else - return "arraytranslate"; -#endif - } - -#ifdef J9_PROJECT_SPECIFIC /** * Can be called from doDelayedTransformations when nodes may have been removed from the tree. Issue 6623 * https://github.com/eclipse-omr/omr/issues/6623 @@ -4243,7 +4196,7 @@ void OMR::ValuePropagation::transformConverterCall(TR::TreeTop *callTree) - if (!performTransformation(comp(), "%sChanging call %s [%p] to %s \n", OPT_DETAILS, callNode->getOpCode().getName(), callNode, transformedTargetName(rm))) + if (!performTransformation(comp(), "%sChanging call %s [%p] to %s \n", OPT_DETAILS, callNode->getOpCode().getName(), callNode, "arraytranslate")) return; TR::CFG *cfg = comp()->getFlowGraph(); diff --git a/compiler/p/codegen/OMRCodeGenerator.cpp b/compiler/p/codegen/OMRCodeGenerator.cpp index 465a74ed55c..9e96d3f6ebc 100644 --- a/compiler/p/codegen/OMRCodeGenerator.cpp +++ b/compiler/p/codegen/OMRCodeGenerator.cpp @@ -1934,20 +1934,6 @@ bool OMR::Power::CodeGenerator::getSupportsOpCodeForAutoSIMD(TR::ILOpCode opcode return TR::CodeGenerator::getSupportsOpCodeForAutoSIMD(&self()->comp()->target().cpu, opcode); } -bool -OMR::Power::CodeGenerator::getSupportsEncodeUtf16LittleWithSurrogateTest() - { - return self()->comp()->target().cpu.supportsFeature(OMR_FEATURE_PPC_HAS_VSX) && - !self()->comp()->getOption(TR_DisableSIMDUTF16LEEncoder); - } - -bool -OMR::Power::CodeGenerator::getSupportsEncodeUtf16BigWithSurrogateTest() - { - return self()->comp()->target().cpu.supportsFeature(OMR_FEATURE_PPC_HAS_VSX) && - !self()->comp()->getOption(TR_DisableSIMDUTF16BEEncoder); - } - void OMR::Power::CodeGenerator::addMetaDataForLoadAddressConstantFixed( diff --git a/compiler/p/codegen/OMRCodeGenerator.hpp b/compiler/p/codegen/OMRCodeGenerator.hpp index 09340f26e6c..afe277997aa 100644 --- a/compiler/p/codegen/OMRCodeGenerator.hpp +++ b/compiler/p/codegen/OMRCodeGenerator.hpp @@ -289,10 +289,6 @@ class OMR_EXTENSIBLE CodeGenerator : public OMR::CodeGenerator static bool getSupportsOpCodeForAutoSIMD(TR::CPU *cpu, TR::ILOpCode opcode); bool getSupportsOpCodeForAutoSIMD(TR::ILOpCode opcode); - bool getSupportsEncodeUtf16LittleWithSurrogateTest(); - - bool getSupportsEncodeUtf16BigWithSurrogateTest(); - int32_t arrayInitMinimumNumberOfBytes() {return 32;} TR::SymbolReference &getDouble2LongSymbolReference() { return *_symRefTab->findOrCreateRuntimeHelper(TR_PPCdouble2Long); } diff --git a/compiler/ras/Debug.cpp b/compiler/ras/Debug.cpp index 1bda7e7070c..e5e79d32212 100644 --- a/compiler/ras/Debug.cpp +++ b/compiler/ras/Debug.cpp @@ -3830,9 +3830,6 @@ TR_Debug::getRuntimeHelperName(int32_t index) case TR_PPCP256addNoMod: return "ECP256addNoMod_PPC"; case TR_PPCP256subNoMod: return "ECP256subNoMod_PPC"; - case TR_PPCencodeUTF16Big: return "__encodeUTF16Big"; - case TR_PPCencodeUTF16Little: return "__encodeUTF16Little"; - case TR_PPCreferenceArrayCopy: return "__referenceArrayCopy"; case TR_PPCgeneralArrayCopy: return "__generalArrayCopy"; case TR_PPCsamplingRecompileMethod: return "__samplingRecompileMethod"; diff --git a/compiler/runtime/Helpers.inc b/compiler/runtime/Helpers.inc index fae1b17c348..6e4ffdb899c 100644 --- a/compiler/runtime/Helpers.inc +++ b/compiler/runtime/Helpers.inc @@ -202,9 +202,7 @@ SETVAL(TR_IA32JitMethodMonitorExitReserved,TR_LXRH+28) SETVAL(TR_IA32arrayTranslateTRTO, TR_LXRH+29) SETVAL(TR_IA32arrayTranslateTROTNoBreak, TR_LXRH+30) SETVAL(TR_IA32arrayTranslateTROT, TR_LXRH+31) -SETVAL(TR_IA32encodeUTF16Big,TR_LXRH+32) -SETVAL(TR_IA32encodeUTF16Little,TR_LXRH+33) -SETVAL(TR_IA32numRuntimeHelpers,TR_LXRH+34) +SETVAL(TR_IA32numRuntimeHelpers,TR_LXRH+32) SETVAL(TR_AMD64floatRemainder,TR_LXRH+0) SETVAL(TR_AMD64doubleRemainder,TR_LXRH+1) @@ -236,12 +234,10 @@ SETVAL(TR_AMD64clockGetTime,TR_LXRH+26) SETVAL(TR_AMD64arrayTranslateTRTO, TR_LXRH+27) SETVAL(TR_AMD64arrayTranslateTROTNoBreak, TR_LXRH+28) SETVAL(TR_AMD64arrayTranslateTROT, TR_LXRH+29) -SETVAL(TR_AMD64encodeUTF16Big,TR_LXRH+30) -SETVAL(TR_AMD64encodeUTF16Little,TR_LXRH+31) -SETVAL(TR_AMD64doAESENCEncrypt,TR_LXRH+32) -SETVAL(TR_AMD64doAESENCDecrypt,TR_LXRH+33) -SETVAL(TR_AMD64java_util_zip_CRC32C_updateBytes,TR_LXRH+34) -SETVAL(TR_AMD64numRuntimeHelpers,TR_LXRH+35) +SETVAL(TR_AMD64doAESENCEncrypt,TR_LXRH+30) +SETVAL(TR_AMD64doAESENCDecrypt,TR_LXRH+31) +SETVAL(TR_AMD64java_util_zip_CRC32C_updateBytes,TR_LXRH+32) +SETVAL(TR_AMD64numRuntimeHelpers,TR_LXRH+33) SETVAL(TR_PPClongDivide,TR_FSRH) SETVAL(TR_PPCnativeStaticHelper,TR_FSRH+1) @@ -324,19 +320,17 @@ SETVAL(TR_PPCquadWordArrayCopy_vsx, TR_FSRH+77) SETVAL(TR_PPCforwardQuadWordArrayCopy_vsx, TR_FSRH+78) SETVAL(TR_PPCpostP10ForwardCopy, TR_FSRH+79) SETVAL(TR_PPCpostP10GenericCopy, TR_FSRH+80) -SETVAL(TR_PPCencodeUTF16Big, TR_FSRH+81) -SETVAL(TR_PPCencodeUTF16Little, TR_FSRH+82) -SETVAL(TR_PPCP256Multiply, TR_FSRH+83) -SETVAL(TR_PPCP256Mod, TR_FSRH+84) -SETVAL(TR_PPCP256addNoMod, TR_FSRH+85) -SETVAL(TR_PPCP256subNoMod, TR_FSRH+86) -SETVAL(TR_PPCAESCBCDecrypt, TR_FSRH+87) -SETVAL(TR_PPCAESCBCEncrypt, TR_FSRH+88) -SETVAL(TR_PPCinterpreterUnresolvedConstantDynamicGlue, TR_FSRH+89) -SETVAL(TR_PPCcrc32_vpmsum, TR_FSRH+90) -SETVAL(TR_PPCcrc32_no_vpmsum, TR_FSRH+91) -SETVAL(TR_PPCcrc32_oneByte, TR_FSRH+92) -SETVAL(TR_PPCnumRuntimeHelpers,TR_FSRH+93) +SETVAL(TR_PPCP256Multiply, TR_FSRH+81) +SETVAL(TR_PPCP256Mod, TR_FSRH+82) +SETVAL(TR_PPCP256addNoMod, TR_FSRH+83) +SETVAL(TR_PPCP256subNoMod, TR_FSRH+84) +SETVAL(TR_PPCAESCBCDecrypt, TR_FSRH+85) +SETVAL(TR_PPCAESCBCEncrypt, TR_FSRH+86) +SETVAL(TR_PPCinterpreterUnresolvedConstantDynamicGlue, TR_FSRH+87) +SETVAL(TR_PPCcrc32_vpmsum, TR_FSRH+88) +SETVAL(TR_PPCcrc32_no_vpmsum, TR_FSRH+89) +SETVAL(TR_PPCcrc32_oneByte, TR_FSRH+90) +SETVAL(TR_PPCnumRuntimeHelpers,TR_FSRH+91) SETVAL(TR_ARMdouble2Long,TR_FSRH) SETVAL(TR_ARMdoubleRemainder,TR_FSRH+1) diff --git a/compiler/x/codegen/OMRCodeGenerator.cpp b/compiler/x/codegen/OMRCodeGenerator.cpp index 9ea35594895..2472d5d227e 100644 --- a/compiler/x/codegen/OMRCodeGenerator.cpp +++ b/compiler/x/codegen/OMRCodeGenerator.cpp @@ -1189,22 +1189,6 @@ OMR::X86::CodeGenerator::getSupportsOpCodeForAutoSIMD(TR::ILOpCode opcode) return TR::CodeGenerator::getSupportsOpCodeForAutoSIMD(&self()->comp()->target().cpu, opcode); } -bool -OMR::X86::CodeGenerator::getSupportsEncodeUtf16LittleWithSurrogateTest() - { - TR_ASSERT_FATAL(self()->comp()->compileRelocatableCode() || self()->comp()->isOutOfProcessCompilation() || self()->comp()->compilePortableCode() || self()->comp()->target().cpu.supportsFeature(OMR_FEATURE_X86_SSE4_1) == TR::CodeGenerator::getX86ProcessorInfo().supportsSSE4_1(), "supportsSSE4_1()"); - return self()->comp()->target().cpu.supportsFeature(OMR_FEATURE_X86_SSE4_1) && - !self()->comp()->getOption(TR_DisableSIMDUTF16LEEncoder); - } - -bool -OMR::X86::CodeGenerator::getSupportsEncodeUtf16BigWithSurrogateTest() - { - TR_ASSERT_FATAL(self()->comp()->compileRelocatableCode() || self()->comp()->isOutOfProcessCompilation() || self()->comp()->compilePortableCode() || self()->comp()->target().cpu.supportsFeature(OMR_FEATURE_X86_SSE4_1) == TR::CodeGenerator::getX86ProcessorInfo().supportsSSE4_1(), "supportsSSE4_1()"); - return self()->comp()->target().cpu.supportsFeature(OMR_FEATURE_X86_SSE4_1) && - !self()->comp()->getOption(TR_DisableSIMDUTF16BEEncoder); - } - bool OMR::X86::CodeGenerator::getSupportsBitPermute() { diff --git a/compiler/x/codegen/OMRCodeGenerator.hpp b/compiler/x/codegen/OMRCodeGenerator.hpp index cdcabdfca65..fea951bcb64 100644 --- a/compiler/x/codegen/OMRCodeGenerator.hpp +++ b/compiler/x/codegen/OMRCodeGenerator.hpp @@ -404,9 +404,6 @@ class OMR_EXTENSIBLE CodeGenerator : public OMR::CodeGenerator static bool getSupportsOpCodeForAutoSIMD(TR::CPU *cpu, TR::ILOpCode opcode); bool getSupportsOpCodeForAutoSIMD(TR::ILOpCode opcode); - bool getSupportsEncodeUtf16LittleWithSurrogateTest(); - bool getSupportsEncodeUtf16BigWithSurrogateTest(); - virtual bool getSupportsBitPermute(); bool supportsNonHelper(TR::SymbolReferenceTable::CommonNonhelperSymbol symbol); diff --git a/compiler/z/codegen/OMRCodeGenerator.cpp b/compiler/z/codegen/OMRCodeGenerator.cpp index b83ab1ab6be..0c75029bbfc 100644 --- a/compiler/z/codegen/OMRCodeGenerator.cpp +++ b/compiler/z/codegen/OMRCodeGenerator.cpp @@ -597,8 +597,6 @@ OMR::Z::CodeGenerator::initialize() comp->setOption(TR_DisableAutoSIMD); comp->setOption(TR_DisableSIMDArrayCompare); comp->setOption(TR_DisableSIMDArrayTranslate); - comp->setOption(TR_DisableSIMDUTF16BEEncoder); - comp->setOption(TR_DisableSIMDUTF16LEEncoder); comp->setOption(TR_DisableSIMDStringHashCode); comp->setOption(TR_DisableVectorRegGRA); } @@ -1934,18 +1932,6 @@ OMR::Z::CodeGenerator::anyLitPoolSnippets() return false; } -bool -OMR::Z::CodeGenerator::getSupportsEncodeUtf16BigWithSurrogateTest() - { - if (self()->comp()->target().cpu.isAtLeast(OMR_PROCESSOR_S390_Z196)) - { - return (!self()->comp()->getOption(TR_DisableUTF16BEEncoder) || - (self()->getSupportsVectorRegisters() && !self()->comp()->getOption(TR_DisableSIMDUTF16BEEncoder))); - } - - return false; - } - TR_S390ScratchRegisterManager* OMR::Z::CodeGenerator::generateScratchRegisterManager(int32_t capacity) { diff --git a/compiler/z/codegen/OMRCodeGenerator.hpp b/compiler/z/codegen/OMRCodeGenerator.hpp index e5c074821c8..bcf38724b0c 100644 --- a/compiler/z/codegen/OMRCodeGenerator.hpp +++ b/compiler/z/codegen/OMRCodeGenerator.hpp @@ -264,8 +264,6 @@ class OMR_EXTENSIBLE CodeGenerator : public OMR::CodeGenerator bool anyNonConstantSnippets(); bool anyLitPoolSnippets(); - bool getSupportsEncodeUtf16BigWithSurrogateTest(); - TR_S390ScratchRegisterManager* generateScratchRegisterManager(int32_t capacity = 8); bool canTransformUnsafeCopyToArrayCopy();