From 744830cb242c82c4637e6fb303b36d0371c84979 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Tue, 10 Sep 2024 21:25:15 +0000 Subject: Revert "riscv64: Add node Rol, fix InstructionBuilder" This reverts commit 39927bc359ccbe65371213c4559126b05dcfb117. Reason for revert: Failure on bot with: error: Statement could not be matched starting from line 1089612 TestRotate.java:95: rol {{a\d+}}, {{a\d+}}, {{a\d+}} ISA_FEATURES = {'rv64gcv_zba_zbb_zbs': True} READ_BARRIER_TYPE = baker 567-checker-builder-intrinsics FAILED: [run-test:1074] CFG checker failed $ ssh -q -F /b/s/w/ir/cache/builder/art/test/testrunner/ssh_config -p 10001 ubuntu@localhost "rm -rf /home/ubuntu/art-test-chroot/data/run-test/test-343039" 567-checker-builder-intrinsics files deleted from host and from target ---------- test-art-target-run-test-ndebug-prebuild-optimizing-no-relocate-ntrace-cms-checkjni-picimage-ndebuggable-no-jvmti-567-checker-builder-intrinsics64 Change-Id: Ic1fd87c331c9eba315af6c98c3ad393766327417 --- compiler/optimizing/instruction_simplifier_shared.cc | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'compiler/optimizing/instruction_simplifier_shared.cc') diff --git a/compiler/optimizing/instruction_simplifier_shared.cc b/compiler/optimizing/instruction_simplifier_shared.cc index 7f575c0348..b7d76da548 100644 --- a/compiler/optimizing/instruction_simplifier_shared.cc +++ b/compiler/optimizing/instruction_simplifier_shared.cc @@ -316,23 +316,4 @@ bool TryReplaceSubSubWithSubAdd(HSub* last_sub) { } } -void UnfoldRotateLeft(HRol* rol) { - HBasicBlock* block = rol->GetBlock(); - HGraph* graph = block->GetGraph(); - ArenaAllocator* allocator = graph->GetAllocator(); - HRor* ror; - - if (rol->GetRight()->IsConstant()) { - int32_t value = rol->GetRight()->AsIntConstant()->GetValue(); - HIntConstant* negated = graph->GetIntConstant(-value); - ror = new (allocator) HRor(rol->GetType(), rol->GetLeft(), negated); - } else { - HNeg* neg = new (allocator) HNeg(DataType::Type::kInt32, rol->GetRight()); - block->InsertInstructionBefore(neg, rol); - ror = new (allocator) HRor(rol->GetType(), rol->GetLeft(), neg); - } - - block->ReplaceAndRemoveInstructionWith(rol, ror); -} - } // namespace art -- cgit v1.2.3-59-g8ed1b