fix merge error once again
This commit is contained in:
@@ -278,7 +278,7 @@
|
|||||||
|
|
||||||
// Size of LSU Request Queue
|
// Size of LSU Request Queue
|
||||||
`ifndef LSUQ_SIZE
|
`ifndef LSUQ_SIZE
|
||||||
`define LSUQ_SIZE (8 * (`NUM_THREADS / `NUM_LSU_LANES))
|
`define LSUQ_SIZE (4 * `NUM_WARPS * (`NUM_THREADS / `NUM_LSU_LANES))
|
||||||
`endif
|
`endif
|
||||||
|
|
||||||
// LSU Duplicate Address Check
|
// LSU Duplicate Address Check
|
||||||
|
|||||||
@@ -35,7 +35,6 @@
|
|||||||
`define NUM_CORES 2
|
`define NUM_CORES 2
|
||||||
`define NUM_THREADS 8
|
`define NUM_THREADS 8
|
||||||
`define NUM_WARPS 8
|
`define NUM_WARPS 8
|
||||||
`endif
|
|
||||||
|
|
||||||
`define FIRESIM
|
`define FIRESIM
|
||||||
`endif // SYNTHESIS
|
`endif // SYNTHESIS
|
||||||
|
|||||||
Reference in New Issue
Block a user