From 65ca0fff3a8bd96a984dd366c009c3cf0e682887 Mon Sep 17 00:00:00 2001 From: Blaise Tine Date: Fri, 20 Oct 2023 00:48:05 -0700 Subject: [PATCH] minor update --- kernel/include/vx_intrinsics.h | 20 -------------------- sim/simx/decode.cpp | 11 +---------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/kernel/include/vx_intrinsics.h b/kernel/include/vx_intrinsics.h index 1dbf4da0..f6cfbf58 100644 --- a/kernel/include/vx_intrinsics.h +++ b/kernel/include/vx_intrinsics.h @@ -98,13 +98,6 @@ extern "C" { __asm__ __volatile__ ("csrc %0, %1" :: "i" (csr), "r" (__v)); \ }) -// Texture load -inline unsigned vx_tex(unsigned stage, unsigned u, unsigned v, unsigned lod) { - unsigned ret; - asm volatile (".insn r4 %1, 0, %2, %0, %3, %4, %5" : "=r"(ret) : "i"(RISCV_CUSTOM1), "i"(stage), "r"(u), "r"(v), "r"(lod)); - return ret; -} - // Conditional move inline unsigned vx_cmov(unsigned c, unsigned t, unsigned f) { unsigned ret; @@ -112,19 +105,6 @@ inline unsigned vx_cmov(unsigned c, unsigned t, unsigned f) { return ret; } -// Rop write -inline void vx_rop(unsigned x, unsigned y, unsigned face, unsigned color, unsigned depth) { - unsigned pos_face = (y << 16) | (x << 1) | face; - asm volatile (".insn r4 %0, 1, 1, x0, %1, %2, %3" :: "i"(RISCV_CUSTOM1), "r"(pos_face), "r"(color), "r"(depth)); -} - -// Raster load -inline unsigned vx_rast() { - unsigned ret; - asm volatile (".insn r %1, 0, 1, %0, x0, x0" : "=r"(ret) : "i"(RISCV_CUSTOM0)); - return ret; -} - // Set thread mask inline void vx_tmc(unsigned thread_mask) { asm volatile (".insn r %0, 0, 0, x0, %1, x0" :: "i"(RISCV_CUSTOM0), "r"(thread_mask)); diff --git a/sim/simx/decode.cpp b/sim/simx/decode.cpp index 361d64f3..ea1dabb3 100644 --- a/sim/simx/decode.cpp +++ b/sim/simx/decode.cpp @@ -405,23 +405,14 @@ static const char* op_string(const Instr &instr) { default: std::abort(); } - case 1: - switch (func3) { - case 0: return "RASTER"; - default: - std::abort(); - } default: std::abort(); } case Opcode::EXT2: switch (func3) { - case 0: - return "TEX"; case 1: { switch (func2) { - case 0: return "CMOV"; - case 1: return "ROP"; + case 0: return "CMOV"; default: std::abort(); }