From 7ea1fec98f850725f59590c20b24cb3ad17df8ad Mon Sep 17 00:00:00 2001 From: Dhruv Chopra Date: Tue, 3 Dec 2019 14:30:02 -0500 Subject: [PATCH] Rename TR_DisableTOCForConstants to TR_DisableTOC The previous name for this option doesn't add much value and the new name can be used to disable the TOC for any number of reasons. Signed-off-by: Dhruv Chopra --- compiler/arm/codegen/ConstantDataSnippet.cpp | 4 ++-- compiler/control/OMROptions.cpp | 2 +- compiler/control/OMROptions.hpp | 2 +- compiler/p/codegen/OMRConstantDataSnippet.cpp | 4 ++-- compiler/p/codegen/OMRTreeEvaluator.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/compiler/arm/codegen/ConstantDataSnippet.cpp b/compiler/arm/codegen/ConstantDataSnippet.cpp index 84d7d8d6c10..b127356f275 100644 --- a/compiler/arm/codegen/ConstantDataSnippet.cpp +++ b/compiler/arm/codegen/ConstantDataSnippet.cpp @@ -73,7 +73,7 @@ int32_t TR::ARMConstantDataSnippet::addConstantRequest(void *v, { fcursor = new (_cg->trHeapMemory()) TR::ARMConstant(_cg, fin.fvalue); _floatConstants.add(fcursor); - if (TR::Compiler->target.is64Bit() && !comp->getOption(TR_DisableTOCForConsts)) + if (TR::Compiler->target.is64Bit() && !comp->getOption(TR_DisableTOC)) { ret = TR_ARMTableOfConstants::lookUp(fin.fvalue, _cg); fcursor->setTOCOffset(ret); @@ -102,7 +102,7 @@ int32_t TR::ARMConstantDataSnippet::addConstantRequest(void *v, { dcursor = new (_cg->trHeapMemory()) TR::ARMConstant(_cg, din.dvalue); _doubleConstants.add(dcursor); - if (TR::Compiler->target.is64Bit() && !comp->getOption(TR_DisableTOCForConsts)) + if (TR::Compiler->target.is64Bit() && !comp->getOption(TR_DisableTOC)) { ret = TR_ARMTableOfConstants::lookUp(din.dvalue, _cg); dcursor->setTOCOffset(ret); diff --git a/compiler/control/OMROptions.cpp b/compiler/control/OMROptions.cpp index 23954a5cbe0..2953c7e0efc 100644 --- a/compiler/control/OMROptions.cpp +++ b/compiler/control/OMROptions.cpp @@ -539,7 +539,7 @@ TR::OptionTable OMR::Options::_jitOptions[] = { {"disableTLE", "O\tdisable transactional lock elision", SET_OPTION_BIT(TR_DisableTLE), "F"}, {"disableTlhPrefetch", "O\tdisable software prefetch on allocation", SET_OPTION_BIT(TR_DisableTLHPrefetch), "F"}, {"disableTM", "O\tdisable transactional memory support", SET_OPTION_BIT(TR_DisableTM), "F"}, - {"disableTOCForConsts", "O\tdisable use of the TOC for constants and floats materialization", SET_OPTION_BIT(TR_DisableTOCForConsts), "F"}, + {"disableTOC", "O\tdisable use of the Table of Contents (TOC) on relevant architectures", SET_OPTION_BIT(TR_DisableTOC), "F"}, {"disableTraceRegDeps", "O\tdisable printing of register dependancies for each instruction in trace file", SET_OPTION_BIT(TR_DisableTraceRegDeps), "F"}, {"disableTraps", "C\tdisable trap instructions", SET_OPTION_BIT(TR_DisableTraps), "F"}, {"disableTreeCleansing", "O\tdisable tree cleansing", TR::Options::disableOptimization, treesCleansing, 0, "P"}, diff --git a/compiler/control/OMROptions.hpp b/compiler/control/OMROptions.hpp index d7276fb3181..b638c75740c 100644 --- a/compiler/control/OMROptions.hpp +++ b/compiler/control/OMROptions.hpp @@ -322,7 +322,7 @@ enum TR_CompilationOptions TR_TurnOffSelectiveNoOptServerIfNoStartupHint = 0x01000000 + 7, TR_TraceDominators = 0x02000000 + 7, TR_EnableHCR = 0x04000000 + 7, // enable hot code replacement - TR_DisableTOCForConsts = 0x08000000 + 7, + TR_DisableTOC = 0x08000000 + 7, TR_UseLowPriorityQueueDuringCLP = 0x10000000 + 7, TR_DisableVectorBCD = 0x20000000 + 7, // Available = 0x40000000 + 7, diff --git a/compiler/p/codegen/OMRConstantDataSnippet.cpp b/compiler/p/codegen/OMRConstantDataSnippet.cpp index 9ba00584cb6..262c93f9fec 100644 --- a/compiler/p/codegen/OMRConstantDataSnippet.cpp +++ b/compiler/p/codegen/OMRConstantDataSnippet.cpp @@ -81,7 +81,7 @@ int32_t OMR::ConstantDataSnippet::addConstantRequest(void *v, { fcursor = new (_cg->trHeapMemory()) PPCConstant(_cg, fin.fvalue); _floatConstants.add(fcursor); - if (TR::Compiler->target.is64Bit() && !comp->getOption(TR_DisableTOCForConsts)) + if (TR::Compiler->target.is64Bit() && !comp->getOption(TR_DisableTOC)) { ret = TR_PPCTableOfConstants::lookUp(fin.fvalue, _cg); } @@ -110,7 +110,7 @@ int32_t OMR::ConstantDataSnippet::addConstantRequest(void *v, { dcursor = new (_cg->trHeapMemory()) PPCConstant(_cg, din.dvalue); _doubleConstants.add(dcursor); - if (TR::Compiler->target.is64Bit() && !comp->getOption(TR_DisableTOCForConsts)) + if (TR::Compiler->target.is64Bit() && !comp->getOption(TR_DisableTOC)) { ret = TR_PPCTableOfConstants::lookUp(din.dvalue, _cg); } diff --git a/compiler/p/codegen/OMRTreeEvaluator.cpp b/compiler/p/codegen/OMRTreeEvaluator.cpp index 6489e7525e3..3c5d6dde487 100644 --- a/compiler/p/codegen/OMRTreeEvaluator.cpp +++ b/compiler/p/codegen/OMRTreeEvaluator.cpp @@ -199,7 +199,7 @@ TR::Instruction *loadConstant(TR::CodeGenerator *cg, TR::Node * node, int64_t va int32_t offset = PTOC_FULL_INDEX; bool canUseTOC = (!TR::isJ9() || !isPicSite) && - !comp->getOption(TR_DisableTOCForConsts); + !comp->getOption(TR_DisableTOC); if (canUseTOC && useTOC) offset = TR_PPCTableOfConstants::lookUp((int8_t *)&value, sizeof(int64_t), true, 0, cg);