From d4a1a63fc4fbfb7ed92862cd8befc7bef2bc602b Mon Sep 17 00:00:00 2001
From: Jeff Law <jlaw@ventanamicro.com>
Date: Tue, 21 Jan 2025 16:20:16 -0700
Subject: [PATCH] Revert "[PATCH 2/2] RISC-V:Add intrinsic cases for the CMOs
 extensions"

This reverts commit b22d9c8f8216d15773dee4f9677c6b26aff507fd.
---
 gcc/testsuite/gcc.target/riscv/cmo-32.c | 58 -------------------------
 gcc/testsuite/gcc.target/riscv/cmo-64.c | 58 -------------------------
 2 files changed, 116 deletions(-)
 delete mode 100644 gcc/testsuite/gcc.target/riscv/cmo-32.c
 delete mode 100644 gcc/testsuite/gcc.target/riscv/cmo-64.c

diff --git a/gcc/testsuite/gcc.target/riscv/cmo-32.c b/gcc/testsuite/gcc.target/riscv/cmo-32.c
deleted file mode 100644
index 071586beacc..00000000000
--- a/gcc/testsuite/gcc.target/riscv/cmo-32.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* { dg-do compile } */
-/* { dg-require-effective-target rv32} */
-/* { dg-options "-march=rv32gc_zicbom_zicbop_zicboz -mabi=ilp32 -std=gnu17" } */
-
-#include "riscv_cmo.h"
-
-void foo1 (void *addr)
-{
-    __riscv_cmo_clean(0);
-    __riscv_cmo_clean(addr);
-    __riscv_cmo_clean((void*)0x111);
-}
-
-void foo2 (void *addr)
-{
-    __riscv_cmo_flush(0);
-    __riscv_cmo_flush(addr);
-    __riscv_cmo_flush((void*)0x111);
-}
-
-void foo3 (void *addr)
-{
-    __riscv_cmo_inval(0);
-    __riscv_cmo_inval(addr);
-    __riscv_cmo_inval((void*)0x111);
-}
-
-void foo4 (void *addr)
-{
-    __riscv_cmo_prefetch(addr,0,0);
-    __riscv_cmo_prefetch(addr,0,1);
-    __riscv_cmo_prefetch(addr,0,2);
-    __riscv_cmo_prefetch(addr,0,3);
-    __riscv_cmo_prefetch(addr,1,0);
-    __riscv_cmo_prefetch(addr,1,1);
-    __riscv_cmo_prefetch(addr,1,2);
-    __riscv_cmo_prefetch(addr,1,3);
-}
-
-int foo5 (int num)
-{
-    return __riscv_cmo_prefetchi(num);
-}
-
-void foo6 (void *addr)
-{
-    __riscv_cmo_zero(0);
-    __riscv_cmo_zero(addr);
-    __riscv_cmo_zero((void*)0x121);
-}
-
-/* { dg-final { scan-assembler-times "cbo.clean\t" 3 } } */
-/* { dg-final { scan-assembler-times "cbo.flush\t" 3 } } */
-/* { dg-final { scan-assembler-times "cbo.inval\t" 3 } } */
-/* { dg-final { scan-assembler-times "prefetch.r\t" 4 } } */
-/* { dg-final { scan-assembler-times "prefetch.w\t" 4 } } */
-/* { dg-final { scan-assembler-times "prefetch.i\t" 1 } } */
-/* { dg-final { scan-assembler-times "cbo.zero\t" 3 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/cmo-64.c b/gcc/testsuite/gcc.target/riscv/cmo-64.c
deleted file mode 100644
index dc9fc97b94b..00000000000
--- a/gcc/testsuite/gcc.target/riscv/cmo-64.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* { dg-do compile } */
-/* { dg-require-effective-target rv64 } */
-/* { dg-options "-march=rv64gc_zicbom_zicbop_zicboz -mabi=lp64d -std=gnu17" } */
-
-#include "riscv_cmo.h"
-
-void foo1 (void *addr)
-{
-    __riscv_cmo_clean(0);
-    __riscv_cmo_clean(addr);
-    __riscv_cmo_clean((void*)0x111);
-}
-
-void foo2 (void *addr)
-{
-    __riscv_cmo_flush(0);
-    __riscv_cmo_flush(addr);
-    __riscv_cmo_flush((void*)0x111);
-}
-
-void foo3 (void *addr)
-{
-    __riscv_cmo_inval(0);
-    __riscv_cmo_inval(addr);
-    __riscv_cmo_inval((void*)0x111);
-}
-
-void foo4 (void *addr)
-{
-    __riscv_cmo_prefetch(addr,0,0);
-    __riscv_cmo_prefetch(addr,0,1);
-    __riscv_cmo_prefetch(addr,0,2);
-    __riscv_cmo_prefetch(addr,0,3);
-    __riscv_cmo_prefetch(addr,1,0);
-    __riscv_cmo_prefetch(addr,1,1);
-    __riscv_cmo_prefetch(addr,1,2);
-    __riscv_cmo_prefetch(addr,1,3);
-}
-
-int foo5 (int num)
-{
-    return __riscv_cmo_prefetchi(num);
-}
-
-void foo6 (void *addr)
-{
-    __riscv_cmo_zero(0);
-    __riscv_cmo_zero(addr);
-    __riscv_cmo_zero((void*)0x121);
-}
-
-/* { dg-final { scan-assembler-times "cbo.clean\t" 3 } } */
-/* { dg-final { scan-assembler-times "cbo.flush\t" 3 } } */
-/* { dg-final { scan-assembler-times "cbo.inval\t" 3 } } */
-/* { dg-final { scan-assembler-times "prefetch.r\t" 4 } } */
-/* { dg-final { scan-assembler-times "prefetch.w\t" 4 } } */
-/* { dg-final { scan-assembler-times "prefetch.i\t" 1 } } */
-/* { dg-final { scan-assembler-times "cbo.zero\t" 3 } } */