From 5d581b8bd10f043e6b73fa0436d5003acaca4934 Mon Sep 17 00:00:00 2001
From: Vladimir Marko <vmarko@google.com>
Date: Thu, 15 Feb 2024 12:13:59 +0000
Subject: riscv64: Enable some gtests.

Keep tests disabled for riscv64 if they are disabled for arm
and arm64.

Fix `GetInstructionSetFromELF()` to recognize riscv64.

This partially reverts commit
    476491deb9f9abb04f25888a20280d950714048b .

Test: run-gtests.sh
Bug: 271573990
Change-Id: Iccf1e2b1e93ed09eaf27884c34696f42fd752ec4
---
 compiler/optimizing/loop_optimization_test.cc | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'compiler/optimizing/loop_optimization_test.cc')

diff --git a/compiler/optimizing/loop_optimization_test.cc b/compiler/optimizing/loop_optimization_test.cc
index 49e3c0418f..7f694fb655 100644
--- a/compiler/optimizing/loop_optimization_test.cc
+++ b/compiler/optimizing/loop_optimization_test.cc
@@ -30,7 +30,6 @@ namespace art HIDDEN {
 class LoopOptimizationTest : public OptimizingUnitTest {
  protected:
   void SetUp() override {
-    TEST_SETUP_DISABLED_FOR_RISCV64();
     OptimizingUnitTest::SetUp();
 
     graph_ = CreateGraph();
@@ -45,7 +44,6 @@ class LoopOptimizationTest : public OptimizingUnitTest {
   }
 
   void TearDown() override {
-    TEST_TEARDOWN_DISABLED_FOR_RISCV64();
     codegen_.reset();
     compiler_options_.reset();
     graph_ = nullptr;
@@ -136,20 +134,17 @@ class LoopOptimizationTest : public OptimizingUnitTest {
 //
 
 TEST_F(LoopOptimizationTest, NoLoops) {
-  TEST_DISABLED_FOR_RISCV64();
   PerformAnalysis();
   EXPECT_EQ("", LoopStructure());
 }
 
 TEST_F(LoopOptimizationTest, SingleLoop) {
-  TEST_DISABLED_FOR_RISCV64();
   AddLoop(entry_block_, return_block_);
   PerformAnalysis();
   EXPECT_EQ("[]", LoopStructure());
 }
 
 TEST_F(LoopOptimizationTest, LoopNest10) {
-  TEST_DISABLED_FOR_RISCV64();
   HBasicBlock* b = entry_block_;
   HBasicBlock* s = return_block_;
   for (int i = 0; i < 10; i++) {
@@ -161,7 +156,6 @@ TEST_F(LoopOptimizationTest, LoopNest10) {
 }
 
 TEST_F(LoopOptimizationTest, LoopSequence10) {
-  TEST_DISABLED_FOR_RISCV64();
   HBasicBlock* b = entry_block_;
   HBasicBlock* s = return_block_;
   for (int i = 0; i < 10; i++) {
@@ -173,7 +167,6 @@ TEST_F(LoopOptimizationTest, LoopSequence10) {
 }
 
 TEST_F(LoopOptimizationTest, LoopSequenceOfNests) {
-  TEST_DISABLED_FOR_RISCV64();
   HBasicBlock* b = entry_block_;
   HBasicBlock* s = return_block_;
   for (int i = 0; i < 10; i++) {
@@ -201,7 +194,6 @@ TEST_F(LoopOptimizationTest, LoopSequenceOfNests) {
 }
 
 TEST_F(LoopOptimizationTest, LoopNestWithSequence) {
-  TEST_DISABLED_FOR_RISCV64();
   HBasicBlock* b = entry_block_;
   HBasicBlock* s = return_block_;
   for (int i = 0; i < 10; i++) {
@@ -223,7 +215,6 @@ TEST_F(LoopOptimizationTest, LoopNestWithSequence) {
 //
 // This is a test for nodes.cc functionality - HGraph::SimplifyLoop.
 TEST_F(LoopOptimizationTest, SimplifyLoopReoderPredecessors) {
-  TEST_DISABLED_FOR_RISCV64();
   // Can't use AddLoop as we want special order for blocks predecessors.
   HBasicBlock* header = new (GetAllocator()) HBasicBlock(graph_);
   HBasicBlock* body = new (GetAllocator()) HBasicBlock(graph_);
@@ -269,7 +260,6 @@ TEST_F(LoopOptimizationTest, SimplifyLoopReoderPredecessors) {
 //
 // This is a test for nodes.cc functionality - HGraph::SimplifyLoop.
 TEST_F(LoopOptimizationTest, SimplifyLoopSinglePreheader) {
-  TEST_DISABLED_FOR_RISCV64();
   HBasicBlock* header = AddLoop(entry_block_, return_block_);
 
   header->InsertInstructionBefore(
-- 
cgit v1.2.3-59-g8ed1b