From 4bbab28e049300c6f897030e92a75de959a3617c Mon Sep 17 00:00:00 2001
From: Daniel Kroening <dkr@amazon.com>
Date: Fri, 21 Jun 2024 07:56:09 -0700
Subject: [PATCH] Verilog: consolidate expression-related tests in
 verilog/expressions

---
 .../verilog/{bit-extract => expressions}/bit-extract1.desc      | 0
 regression/verilog/{bit-extract => expressions}/bit-extract1.v  | 0
 .../verilog/{bit-extract => expressions}/bit-extract2.desc      | 0
 regression/verilog/{bit-extract => expressions}/bit-extract2.v  | 0
 .../verilog/{bit-extract => expressions}/bit-extract3.desc      | 0
 regression/verilog/{bit-extract => expressions}/bit-extract3.sv | 0
 .../verilog/{bit-extract => expressions}/bit-extract4.desc      | 0
 regression/verilog/{bit-extract => expressions}/bit-extract4.sv | 0
 .../verilog/{concatenation => expressions}/concatenation1.desc  | 0
 .../verilog/{concatenation => expressions}/concatenation1.v     | 0
 .../verilog/{concatenation => expressions}/concatenation2.desc  | 0
 .../verilog/{concatenation => expressions}/concatenation2.v     | 0
 .../verilog/{shr1/test.desc => expressions/constants1.desc}     | 2 +-
 .../verilog/{constants1/main.v => expressions/constants1.v}     | 0
 .../verilog/{part-select => expressions}/index-of-real.desc     | 0
 .../verilog/{part-select => expressions}/index-of-real.sv       | 0
 .../{part-select => expressions}/part-select-of-real.desc       | 0
 .../verilog/{part-select => expressions}/part-select-of-real.sv | 0
 regression/verilog/{part-select => expressions}/real-index.desc | 0
 regression/verilog/{part-select => expressions}/real-index.sv   | 0
 .../verilog/{replication => expressions}/replication1.desc      | 0
 regression/verilog/{replication => expressions}/replication1.v  | 0
 .../verilog/{constants1/test.desc => expressions/shr1.desc}     | 2 +-
 regression/verilog/{shr1/main.v => expressions/shr1.v}          | 0
 regression/verilog/{casts => expressions}/size_cast1.desc       | 0
 regression/verilog/{casts => expressions}/size_cast1.sv         | 0
 regression/verilog/{casts => expressions}/static_cast1.desc     | 0
 regression/verilog/{casts => expressions}/static_cast1.sv       | 0
 28 files changed, 2 insertions(+), 2 deletions(-)
 rename regression/verilog/{bit-extract => expressions}/bit-extract1.desc (100%)
 rename regression/verilog/{bit-extract => expressions}/bit-extract1.v (100%)
 rename regression/verilog/{bit-extract => expressions}/bit-extract2.desc (100%)
 rename regression/verilog/{bit-extract => expressions}/bit-extract2.v (100%)
 rename regression/verilog/{bit-extract => expressions}/bit-extract3.desc (100%)
 rename regression/verilog/{bit-extract => expressions}/bit-extract3.sv (100%)
 rename regression/verilog/{bit-extract => expressions}/bit-extract4.desc (100%)
 rename regression/verilog/{bit-extract => expressions}/bit-extract4.sv (100%)
 rename regression/verilog/{concatenation => expressions}/concatenation1.desc (100%)
 rename regression/verilog/{concatenation => expressions}/concatenation1.v (100%)
 rename regression/verilog/{concatenation => expressions}/concatenation2.desc (100%)
 rename regression/verilog/{concatenation => expressions}/concatenation2.v (100%)
 rename regression/verilog/{shr1/test.desc => expressions/constants1.desc} (81%)
 rename regression/verilog/{constants1/main.v => expressions/constants1.v} (100%)
 rename regression/verilog/{part-select => expressions}/index-of-real.desc (100%)
 rename regression/verilog/{part-select => expressions}/index-of-real.sv (100%)
 rename regression/verilog/{part-select => expressions}/part-select-of-real.desc (100%)
 rename regression/verilog/{part-select => expressions}/part-select-of-real.sv (100%)
 rename regression/verilog/{part-select => expressions}/real-index.desc (100%)
 rename regression/verilog/{part-select => expressions}/real-index.sv (100%)
 rename regression/verilog/{replication => expressions}/replication1.desc (100%)
 rename regression/verilog/{replication => expressions}/replication1.v (100%)
 rename regression/verilog/{constants1/test.desc => expressions/shr1.desc} (89%)
 rename regression/verilog/{shr1/main.v => expressions/shr1.v} (100%)
 rename regression/verilog/{casts => expressions}/size_cast1.desc (100%)
 rename regression/verilog/{casts => expressions}/size_cast1.sv (100%)
 rename regression/verilog/{casts => expressions}/static_cast1.desc (100%)
 rename regression/verilog/{casts => expressions}/static_cast1.sv (100%)

diff --git a/regression/verilog/bit-extract/bit-extract1.desc b/regression/verilog/expressions/bit-extract1.desc
similarity index 100%
rename from regression/verilog/bit-extract/bit-extract1.desc
rename to regression/verilog/expressions/bit-extract1.desc
diff --git a/regression/verilog/bit-extract/bit-extract1.v b/regression/verilog/expressions/bit-extract1.v
similarity index 100%
rename from regression/verilog/bit-extract/bit-extract1.v
rename to regression/verilog/expressions/bit-extract1.v
diff --git a/regression/verilog/bit-extract/bit-extract2.desc b/regression/verilog/expressions/bit-extract2.desc
similarity index 100%
rename from regression/verilog/bit-extract/bit-extract2.desc
rename to regression/verilog/expressions/bit-extract2.desc
diff --git a/regression/verilog/bit-extract/bit-extract2.v b/regression/verilog/expressions/bit-extract2.v
similarity index 100%
rename from regression/verilog/bit-extract/bit-extract2.v
rename to regression/verilog/expressions/bit-extract2.v
diff --git a/regression/verilog/bit-extract/bit-extract3.desc b/regression/verilog/expressions/bit-extract3.desc
similarity index 100%
rename from regression/verilog/bit-extract/bit-extract3.desc
rename to regression/verilog/expressions/bit-extract3.desc
diff --git a/regression/verilog/bit-extract/bit-extract3.sv b/regression/verilog/expressions/bit-extract3.sv
similarity index 100%
rename from regression/verilog/bit-extract/bit-extract3.sv
rename to regression/verilog/expressions/bit-extract3.sv
diff --git a/regression/verilog/bit-extract/bit-extract4.desc b/regression/verilog/expressions/bit-extract4.desc
similarity index 100%
rename from regression/verilog/bit-extract/bit-extract4.desc
rename to regression/verilog/expressions/bit-extract4.desc
diff --git a/regression/verilog/bit-extract/bit-extract4.sv b/regression/verilog/expressions/bit-extract4.sv
similarity index 100%
rename from regression/verilog/bit-extract/bit-extract4.sv
rename to regression/verilog/expressions/bit-extract4.sv
diff --git a/regression/verilog/concatenation/concatenation1.desc b/regression/verilog/expressions/concatenation1.desc
similarity index 100%
rename from regression/verilog/concatenation/concatenation1.desc
rename to regression/verilog/expressions/concatenation1.desc
diff --git a/regression/verilog/concatenation/concatenation1.v b/regression/verilog/expressions/concatenation1.v
similarity index 100%
rename from regression/verilog/concatenation/concatenation1.v
rename to regression/verilog/expressions/concatenation1.v
diff --git a/regression/verilog/concatenation/concatenation2.desc b/regression/verilog/expressions/concatenation2.desc
similarity index 100%
rename from regression/verilog/concatenation/concatenation2.desc
rename to regression/verilog/expressions/concatenation2.desc
diff --git a/regression/verilog/concatenation/concatenation2.v b/regression/verilog/expressions/concatenation2.v
similarity index 100%
rename from regression/verilog/concatenation/concatenation2.v
rename to regression/verilog/expressions/concatenation2.v
diff --git a/regression/verilog/shr1/test.desc b/regression/verilog/expressions/constants1.desc
similarity index 81%
rename from regression/verilog/shr1/test.desc
rename to regression/verilog/expressions/constants1.desc
index 6951d7524..b133bca1c 100644
--- a/regression/verilog/shr1/test.desc
+++ b/regression/verilog/expressions/constants1.desc
@@ -1,5 +1,5 @@
 CORE
-main.v
+constants1.v
 --bound 1
 ^EXIT=0$
 ^SIGNAL=0$
diff --git a/regression/verilog/constants1/main.v b/regression/verilog/expressions/constants1.v
similarity index 100%
rename from regression/verilog/constants1/main.v
rename to regression/verilog/expressions/constants1.v
diff --git a/regression/verilog/part-select/index-of-real.desc b/regression/verilog/expressions/index-of-real.desc
similarity index 100%
rename from regression/verilog/part-select/index-of-real.desc
rename to regression/verilog/expressions/index-of-real.desc
diff --git a/regression/verilog/part-select/index-of-real.sv b/regression/verilog/expressions/index-of-real.sv
similarity index 100%
rename from regression/verilog/part-select/index-of-real.sv
rename to regression/verilog/expressions/index-of-real.sv
diff --git a/regression/verilog/part-select/part-select-of-real.desc b/regression/verilog/expressions/part-select-of-real.desc
similarity index 100%
rename from regression/verilog/part-select/part-select-of-real.desc
rename to regression/verilog/expressions/part-select-of-real.desc
diff --git a/regression/verilog/part-select/part-select-of-real.sv b/regression/verilog/expressions/part-select-of-real.sv
similarity index 100%
rename from regression/verilog/part-select/part-select-of-real.sv
rename to regression/verilog/expressions/part-select-of-real.sv
diff --git a/regression/verilog/part-select/real-index.desc b/regression/verilog/expressions/real-index.desc
similarity index 100%
rename from regression/verilog/part-select/real-index.desc
rename to regression/verilog/expressions/real-index.desc
diff --git a/regression/verilog/part-select/real-index.sv b/regression/verilog/expressions/real-index.sv
similarity index 100%
rename from regression/verilog/part-select/real-index.sv
rename to regression/verilog/expressions/real-index.sv
diff --git a/regression/verilog/replication/replication1.desc b/regression/verilog/expressions/replication1.desc
similarity index 100%
rename from regression/verilog/replication/replication1.desc
rename to regression/verilog/expressions/replication1.desc
diff --git a/regression/verilog/replication/replication1.v b/regression/verilog/expressions/replication1.v
similarity index 100%
rename from regression/verilog/replication/replication1.v
rename to regression/verilog/expressions/replication1.v
diff --git a/regression/verilog/constants1/test.desc b/regression/verilog/expressions/shr1.desc
similarity index 89%
rename from regression/verilog/constants1/test.desc
rename to regression/verilog/expressions/shr1.desc
index 6951d7524..c8ecde3b5 100644
--- a/regression/verilog/constants1/test.desc
+++ b/regression/verilog/expressions/shr1.desc
@@ -1,5 +1,5 @@
 CORE
-main.v
+shr1.v
 --bound 1
 ^EXIT=0$
 ^SIGNAL=0$
diff --git a/regression/verilog/shr1/main.v b/regression/verilog/expressions/shr1.v
similarity index 100%
rename from regression/verilog/shr1/main.v
rename to regression/verilog/expressions/shr1.v
diff --git a/regression/verilog/casts/size_cast1.desc b/regression/verilog/expressions/size_cast1.desc
similarity index 100%
rename from regression/verilog/casts/size_cast1.desc
rename to regression/verilog/expressions/size_cast1.desc
diff --git a/regression/verilog/casts/size_cast1.sv b/regression/verilog/expressions/size_cast1.sv
similarity index 100%
rename from regression/verilog/casts/size_cast1.sv
rename to regression/verilog/expressions/size_cast1.sv
diff --git a/regression/verilog/casts/static_cast1.desc b/regression/verilog/expressions/static_cast1.desc
similarity index 100%
rename from regression/verilog/casts/static_cast1.desc
rename to regression/verilog/expressions/static_cast1.desc
diff --git a/regression/verilog/casts/static_cast1.sv b/regression/verilog/expressions/static_cast1.sv
similarity index 100%
rename from regression/verilog/casts/static_cast1.sv
rename to regression/verilog/expressions/static_cast1.sv