Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(814)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/mips64/simulator-mips64.cc

Issue 2908753002: MIPS[64]: Implement insert.df and I8 instructions in simulator (Closed)
Patch Set: Review comments, rebase Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/mips64/simulator-mips64.h ('k') | test/cctest/test-assembler-mips.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/mips64/simulator-mips64.cc
diff --git a/src/mips64/simulator-mips64.cc b/src/mips64/simulator-mips64.cc
index 3b2886498adc61ebd06540f00045eb14a019b49f..f682d8811179888df94353a45ff845e277841d6b 100644
--- a/src/mips64/simulator-mips64.cc
+++ b/src/mips64/simulator-mips64.cc
@@ -1737,6 +1737,43 @@ void Simulator::TraceMSARegWr(T* value, TraceType t) {
}
}
+template <typename T>
+void Simulator::TraceMSARegWr(T* value) {
+ if (::v8::internal::FLAG_trace_sim) {
+ union {
+ uint8_t b[kMSALanesByte];
+ uint16_t h[kMSALanesHalf];
+ uint32_t w[kMSALanesWord];
+ uint64_t d[kMSALanesDword];
+ float f[kMSALanesWord];
+ double df[kMSALanesDword];
+ } v;
+ memcpy(v.b, value, kMSALanesByte);
+
+ if (std::is_same<T, int32_t>::value) {
+ SNPrintF(trace_buf_,
+ "LO: %016" PRIx64 " HI: %016" PRIx64 " (%" PRIu64
+ ") int32[0..3]:%" PRId32 " %" PRId32 " %" PRId32
+ " %" PRId32,
+ v.d[0], v.d[1], icount_, v.w[0], v.w[1], v.w[2], v.w[3]);
+ } else if (std::is_same<T, float>::value) {
+ SNPrintF(trace_buf_,
+ "LO: %016" PRIx64 " HI: %016" PRIx64 " (%" PRIu64
+ ") flt[0..3]:%e %e %e %e",
+ v.d[0], v.d[1], icount_, v.f[0], v.f[1], v.f[2], v.f[3]);
+ } else if (std::is_same<T, double>::value) {
+ SNPrintF(trace_buf_,
+ "LO: %016" PRIx64 " HI: %016" PRIx64 " (%" PRIu64
+ ") dbl[0..1]:%e %e",
+ v.d[0], v.d[1], icount_, v.df[0], v.df[1]);
+ } else {
+ SNPrintF(trace_buf_,
+ "LO: %016" PRIx64 " HI: %016" PRIx64 " (%" PRIu64 ")",
+ v.d[0], v.d[1], icount_);
+ }
+ }
+}
+
// TODO(plind): consider making icount_ printing a flag option.
void Simulator::TraceMemRd(int64_t addr, int64_t value, TraceType t) {
if (::v8::internal::FLAG_trace_sim) {
@@ -4485,19 +4522,97 @@ void Simulator::DecodeTypeMsaI8() {
DCHECK(kArchVariant == kMips64r6);
DCHECK(CpuFeatures::IsSupported(MIPS_SIMD));
uint32_t opcode = instr_.InstructionBits() & kMsaI8Mask;
+ int8_t i8 = instr_.MsaImm8Value();
+ msa_reg_t ws, wd;
switch (opcode) {
case ANDI_B:
+ get_msa_register(instr_.WsValue(), ws.b);
+ for (int i = 0; i < kMSALanesByte; i++) {
+ wd.b[i] = ws.b[i] & i8;
+ }
+ set_msa_register(instr_.WdValue(), wd.b);
+ TraceMSARegWr(wd.b);
+ break;
case ORI_B:
+ get_msa_register(instr_.WsValue(), ws.b);
+ for (int i = 0; i < kMSALanesByte; i++) {
+ wd.b[i] = ws.b[i] | i8;
+ }
+ set_msa_register(instr_.WdValue(), wd.b);
+ TraceMSARegWr(wd.b);
+ break;
case NORI_B:
+ get_msa_register(instr_.WsValue(), ws.b);
+ for (int i = 0; i < kMSALanesByte; i++) {
+ wd.b[i] = ~(ws.b[i] | i8);
+ }
+ set_msa_register(instr_.WdValue(), wd.b);
+ TraceMSARegWr(wd.b);
+ break;
case XORI_B:
+ get_msa_register(instr_.WsValue(), ws.b);
+ for (int i = 0; i < kMSALanesByte; i++) {
+ wd.b[i] = ws.b[i] ^ i8;
+ }
+ set_msa_register(instr_.WdValue(), wd.b);
+ TraceMSARegWr(wd.b);
+ break;
case BMNZI_B:
+ get_msa_register(instr_.WsValue(), ws.b);
+ get_msa_register(instr_.WdValue(), wd.b);
+ for (int i = 0; i < kMSALanesByte; i++) {
+ wd.b[i] = (ws.b[i] & i8) | (wd.b[i] & ~i8);
+ }
+ set_msa_register(instr_.WdValue(), wd.b);
+ TraceMSARegWr(wd.b);
+ break;
case BMZI_B:
+ get_msa_register(instr_.WsValue(), ws.b);
+ get_msa_register(instr_.WdValue(), wd.b);
+ for (int i = 0; i < kMSALanesByte; i++) {
+ wd.b[i] = (ws.b[i] & ~i8) | (wd.b[i] & i8);
+ }
+ set_msa_register(instr_.WdValue(), wd.b);
+ TraceMSARegWr(wd.b);
+ break;
case BSELI_B:
+ get_msa_register(instr_.WsValue(), ws.b);
+ get_msa_register(instr_.WdValue(), wd.b);
+ for (int i = 0; i < kMSALanesByte; i++) {
+ wd.b[i] = (ws.b[i] & ~wd.b[i]) | (wd.b[i] & i8);
+ }
+ set_msa_register(instr_.WdValue(), wd.b);
+ TraceMSARegWr(wd.b);
+ break;
case SHF_B:
+ get_msa_register(instr_.WsValue(), ws.b);
+ for (int i = 0; i < kMSALanesByte; i++) {
+ int j = i % 4;
+ int k = (i8 >> (2 * j)) & 0x3;
+ wd.b[i] = ws.b[i - j + k];
+ }
+ set_msa_register(instr_.WdValue(), wd.b);
+ TraceMSARegWr(wd.b);
+ break;
case SHF_H:
+ get_msa_register(instr_.WsValue(), ws.h);
+ for (int i = 0; i < kMSALanesHalf; i++) {
+ int j = i % 4;
+ int k = (i8 >> (2 * j)) & 0x3;
+ wd.h[i] = ws.h[i - j + k];
+ }
+ set_msa_register(instr_.WdValue(), wd.h);
+ TraceMSARegWr(wd.h);
+ break;
case SHF_W:
- UNIMPLEMENTED();
+ get_msa_register(instr_.WsValue(), ws.w);
+ for (int i = 0; i < kMSALanesWord; i++) {
+ int j = (i8 >> (2 * i)) & 0x3;
+ wd.w[i] = ws.w[j];
+ }
+ set_msa_register(instr_.WdValue(), wd.w);
+ TraceMSARegWr(wd.w);
break;
default:
UNREACHABLE();
@@ -4547,48 +4662,83 @@ void Simulator::DecodeTypeMsaELM() {
int64_t alu_out;
switch (opcode) {
case COPY_S:
- case COPY_U:
+ case COPY_U: {
+ msa_reg_t ws;
switch (DecodeMsaDataFormat()) {
- case MSA_BYTE: {
- DCHECK(n < 16);
- int8_t ws[16];
- get_msa_register(instr_.WsValue(), ws);
- alu_out = static_cast<int32_t>(ws[n]);
+ case MSA_BYTE:
+ DCHECK(n < kMSALanesByte);
+ get_msa_register(instr_.WsValue(), ws.b);
+ alu_out = static_cast<int32_t>(ws.b[n]);
SetResult(wd_reg(), (opcode == COPY_U) ? alu_out & 0xFFu : alu_out);
break;
+ case MSA_HALF:
+ DCHECK(n < kMSALanesHalf);
+ get_msa_register(instr_.WsValue(), ws.h);
+ alu_out = static_cast<int32_t>(ws.h[n]);
+ SetResult(wd_reg(), (opcode == COPY_U) ? alu_out & 0xFFFFu : alu_out);
+ break;
+ case MSA_WORD:
+ DCHECK(n < kMSALanesWord);
+ get_msa_register(instr_.WsValue(), ws.w);
+ alu_out = static_cast<int32_t>(ws.w[n]);
+ SetResult(wd_reg(),
+ (opcode == COPY_U) ? alu_out & 0xFFFFFFFFu : alu_out);
+ break;
+ case MSA_DWORD:
+ DCHECK(n < kMSALanesDword);
+ get_msa_register(instr_.WsValue(), ws.d);
+ alu_out = static_cast<int64_t>(ws.d[n]);
+ SetResult(wd_reg(), alu_out);
+ break;
+ default:
+ UNREACHABLE();
+ }
+ } break;
+ case INSERT: {
+ msa_reg_t wd;
+ switch (DecodeMsaDataFormat()) {
+ case MSA_BYTE: {
+ DCHECK(n < kMSALanesByte);
+ int64_t rs = get_register(instr_.WsValue());
+ get_msa_register(instr_.WdValue(), wd.b);
+ wd.b[n] = rs & 0xFFu;
+ set_msa_register(instr_.WdValue(), wd.b);
+ TraceMSARegWr(wd.b);
+ break;
}
case MSA_HALF: {
- DCHECK(n < 8);
- int16_t ws[8];
- get_msa_register(instr_.WsValue(), ws);
- alu_out = static_cast<int32_t>(ws[n]);
- SetResult(wd_reg(), (opcode == COPY_U) ? alu_out & 0xFFFFu : alu_out);
+ DCHECK(n < kMSALanesHalf);
+ int64_t rs = get_register(instr_.WsValue());
+ get_msa_register(instr_.WdValue(), wd.h);
+ wd.h[n] = rs & 0xFFFFu;
+ set_msa_register(instr_.WdValue(), wd.h);
+ TraceMSARegWr(wd.h);
break;
}
case MSA_WORD: {
- DCHECK(n < 4);
- int32_t ws[4];
- get_msa_register(instr_.WsValue(), ws);
- alu_out = static_cast<int32_t>(ws[n]);
- SetResult(wd_reg(),
- (opcode == COPY_U) ? alu_out & 0xFFFFFFFFu : alu_out);
+ DCHECK(n < kMSALanesWord);
+ int64_t rs = get_register(instr_.WsValue());
+ get_msa_register(instr_.WdValue(), wd.w);
+ wd.w[n] = rs & 0xFFFFFFFFu;
+ set_msa_register(instr_.WdValue(), wd.w);
+ TraceMSARegWr(wd.w);
break;
}
case MSA_DWORD: {
- DCHECK(n < 2);
- int64_t ws[2];
- get_msa_register(instr_.WsValue(), ws);
- alu_out = static_cast<int64_t>(ws[n]);
- SetResult(wd_reg(), alu_out);
+ DCHECK(n < kMSALanesDword);
+ int64_t rs = get_register(instr_.WsValue());
+ get_msa_register(instr_.WdValue(), wd.d);
+ wd.d[n] = rs;
+ set_msa_register(instr_.WdValue(), wd.d);
+ TraceMSARegWr(wd.d);
break;
}
default:
UNREACHABLE();
}
- break;
+ } break;
case SLDI:
case SPLATI:
- case INSERT:
case INSVE:
UNIMPLEMENTED();
break;
@@ -4786,45 +4936,42 @@ void Simulator::DecodeTypeMsa2R() {
DCHECK(kArchVariant == kMips64r6);
DCHECK(CpuFeatures::IsSupported(MIPS_SIMD));
uint32_t opcode = instr_.InstructionBits() & kMsa2RMask;
+ msa_reg_t wd;
switch (opcode) {
case FILL:
switch (DecodeMsaDataFormat()) {
case MSA_BYTE: {
- int8_t wd[16];
int64_t rs = get_register(instr_.WsValue());
- for (int i = 0; i < 16; i++) {
- wd[i] = rs & 0xFFu;
+ for (int i = 0; i < kMSALanesByte; i++) {
+ wd.b[i] = rs & 0xFFu;
}
- set_msa_register(instr_.WdValue(), wd);
- TraceMSARegWr(wd, BYTE);
+ set_msa_register(instr_.WdValue(), wd.b);
+ TraceMSARegWr(wd.b);
break;
}
case MSA_HALF: {
- int16_t wd[8];
int64_t rs = get_register(instr_.WsValue());
- for (int i = 0; i < 8; i++) {
- wd[i] = rs & 0xFFFFu;
+ for (int i = 0; i < kMSALanesHalf; i++) {
+ wd.h[i] = rs & 0xFFFFu;
}
- set_msa_register(instr_.WdValue(), wd);
- TraceMSARegWr(wd, HALF);
+ set_msa_register(instr_.WdValue(), wd.h);
+ TraceMSARegWr(wd.h);
break;
}
case MSA_WORD: {
- int32_t wd[4];
int64_t rs = get_register(instr_.WsValue());
- for (int i = 0; i < 4; i++) {
- wd[i] = rs & 0xFFFFFFFFu;
+ for (int i = 0; i < kMSALanesWord; i++) {
+ wd.w[i] = rs & 0xFFFFFFFFu;
}
- set_msa_register(instr_.WdValue(), wd);
- TraceMSARegWr(wd, WORD);
+ set_msa_register(instr_.WdValue(), wd.w);
+ TraceMSARegWr(wd.w);
break;
}
case MSA_DWORD: {
- int64_t wd[2];
int64_t rs = get_register(instr_.WsValue());
- wd[0] = wd[1] = rs;
- set_msa_register(instr_.WdValue(), wd);
- TraceMSARegWr(wd, DWORD);
+ wd.d[0] = wd.d[1] = rs;
+ set_msa_register(instr_.WdValue(), wd.d);
+ TraceMSARegWr(wd.d);
break;
}
default:
« no previous file with comments | « src/mips64/simulator-mips64.h ('k') | test/cctest/test-assembler-mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698