diff --git a/clang/test/CodeGen/attr-riscv-rvv-vector-bits-bitcast.c b/clang/test/CodeGen/RISCV/attr-rvv-vector-bits-bitcast.c
similarity index 100%
rename from clang/test/CodeGen/attr-riscv-rvv-vector-bits-bitcast.c
rename to clang/test/CodeGen/RISCV/attr-rvv-vector-bits-bitcast.c
diff --git a/clang/test/CodeGen/attr-riscv-rvv-vector-bits-call.c b/clang/test/CodeGen/RISCV/attr-rvv-vector-bits-call.c
similarity index 100%
rename from clang/test/CodeGen/attr-riscv-rvv-vector-bits-call.c
rename to clang/test/CodeGen/RISCV/attr-rvv-vector-bits-call.c
diff --git a/clang/test/CodeGen/attr-riscv-rvv-vector-bits-cast.c b/clang/test/CodeGen/RISCV/attr-rvv-vector-bits-cast.c
similarity index 100%
rename from clang/test/CodeGen/attr-riscv-rvv-vector-bits-cast.c
rename to clang/test/CodeGen/RISCV/attr-rvv-vector-bits-cast.c
diff --git a/clang/test/CodeGen/attr-riscv-rvv-vector-bits-codegen.c b/clang/test/CodeGen/RISCV/attr-rvv-vector-bits-codegen.c
similarity index 100%
rename from clang/test/CodeGen/attr-riscv-rvv-vector-bits-codegen.c
rename to clang/test/CodeGen/RISCV/attr-rvv-vector-bits-codegen.c
diff --git a/clang/test/CodeGen/attr-riscv-rvv-vector-bits-globals.c b/clang/test/CodeGen/RISCV/attr-rvv-vector-bits-globals.c
similarity index 100%
rename from clang/test/CodeGen/attr-riscv-rvv-vector-bits-globals.c
rename to clang/test/CodeGen/RISCV/attr-rvv-vector-bits-globals.c
diff --git a/clang/test/CodeGen/attr-riscv-rvv-vector-bits-types.c b/clang/test/CodeGen/RISCV/attr-rvv-vector-bits-types.c
similarity index 100%
rename from clang/test/CodeGen/attr-riscv-rvv-vector-bits-types.c
rename to clang/test/CodeGen/RISCV/attr-rvv-vector-bits-types.c
diff --git a/clang/test/CodeGen/riscv32-ilp32d-abi.cpp b/clang/test/CodeGen/RISCV/riscv32-ilp32d-abi.cpp
similarity index 100%
rename from clang/test/CodeGen/riscv32-ilp32d-abi.cpp
rename to clang/test/CodeGen/RISCV/riscv32-ilp32d-abi.cpp
diff --git a/clang/test/CodeGen/riscv-rvv-vls-arith-ops.c b/clang/test/CodeGen/RISCV/rvv-vls-arith-ops.c
similarity index 100%
rename from clang/test/CodeGen/riscv-rvv-vls-arith-ops.c
rename to clang/test/CodeGen/RISCV/rvv-vls-arith-ops.c
diff --git a/clang/test/CodeGen/riscv-rvv-vls-bitwise-ops.c b/clang/test/CodeGen/RISCV/rvv-vls-bitwise-ops.c
similarity index 100%
rename from clang/test/CodeGen/riscv-rvv-vls-bitwise-ops.c
rename to clang/test/CodeGen/RISCV/rvv-vls-bitwise-ops.c
diff --git a/clang/test/CodeGen/riscv-rvv-vls-compare-ops.c b/clang/test/CodeGen/RISCV/rvv-vls-compare-ops.c
similarity index 100%
rename from clang/test/CodeGen/riscv-rvv-vls-compare-ops.c
rename to clang/test/CodeGen/RISCV/rvv-vls-compare-ops.c
diff --git a/clang/test/CodeGen/riscv-rvv-vls-shift-ops.c b/clang/test/CodeGen/RISCV/rvv-vls-shift-ops.c
similarity index 100%
rename from clang/test/CodeGen/riscv-rvv-vls-shift-ops.c
rename to clang/test/CodeGen/RISCV/rvv-vls-shift-ops.c
diff --git a/clang/test/CodeGen/riscv-rvv-vls-subscript-ops.c b/clang/test/CodeGen/RISCV/rvv-vls-subscript-ops.c
similarity index 100%
rename from clang/test/CodeGen/riscv-rvv-vls-subscript-ops.c
rename to clang/test/CodeGen/RISCV/rvv-vls-subscript-ops.c
diff --git a/clang/test/CodeGen/riscv-vector-bits-vscale-range.c b/clang/test/CodeGen/RISCV/vector-bits-vscale-range.c
similarity index 100%
rename from clang/test/CodeGen/riscv-vector-bits-vscale-range.c
rename to clang/test/CodeGen/RISCV/vector-bits-vscale-range.c