Skip to content

Commit

Permalink
ME tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
@muwyse
muwyse committed Jun 17, 2020
1 parent e9a9c5e commit 42cadcd
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 39 deletions.
1 change: 0 additions & 1 deletion bp_me/src/v/lce/bp_lce_cmd.v
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,6 @@ module bp_lce_cmd
// when data sends and command is dequeued
e_lce_cmd_uc_data: begin
data_mem_pkt.index = lce_cmd_addr_index;
data_mem_pkt.way_id = lce_cmd_way_id;
data_mem_pkt.data = lce_cmd.data;
data_mem_pkt.opcode = e_cache_data_mem_uncached;
data_mem_pkt_v_o = lce_cmd_v_i;
Expand Down
6 changes: 3 additions & 3 deletions bp_me/test/common/bp_me_nonsynth_lce_tracer.v
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ module bp_me_nonsynth_lce_tracer
// command to LCE
if (lce_cmd_v_i & lce_cmd_yumi_i) begin
assert(lce_cmd.header.dst_id == lce_id_i) else $error("Bad LCE Command - destination mismatch");
$fdisplay(file, "[%t]: LCE[%0d] CMD IN addr[%H] cce[%0d] msg[%b] way[%0d] state[%b] tgt[%0d] tgt_way[%0d] len[%b] %H"
$fdisplay(file, "[%t]: LCE[%0d] CMD IN addr[%H] cce[%0d] msg[%b] set[%0d] way[%0d] state[%b] tgt[%0d] tgt_way[%0d] len[%b] %H"
, $time, lce_cmd.header.dst_id, lce_cmd.header.addr, lce_cmd.header.src_id, lce_cmd.header.msg_type
, lce_cmd.header.way_id, lce_cmd.header.state, lce_cmd.header.target, lce_cmd.header.target_way_id
, lce_cmd.header.size, lce_cmd.data
, lce_cmd.header.addr[block_offset_bits_lp+:lg_sets_lp], lce_cmd.header.way_id, lce_cmd.header.state, lce_cmd.header.target
, lce_cmd.header.target_way_id, lce_cmd.header.size, lce_cmd.data
);
end

Expand Down
66 changes: 31 additions & 35 deletions ci/multicore.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,50 +40,46 @@ builds+=(
fi

sims=(
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_single_core_ucode_cce_cfg PROG=mc_sanity_1"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_single_core_ucode_cce_cfg PROG=mc_rand_walk_1"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_single_core_ucode_cce_cfg PROG=mc_work_share_sort_1"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_single_core_cfg PROG=mc_sanity_1"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_single_core_cfg PROG=mc_rand_walk_1"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_single_core_cfg PROG=mc_work_share_sort_1"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_dual_core_ucode_cce_cfg PROG=mc_sanity_2"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_dual_core_ucode_cce_cfg PROG=mc_rand_walk_2"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_dual_core_ucode_cce_cfg PROG=mc_work_share_sort_2"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_dual_core_cfg PROG=mc_sanity_2"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_dual_core_cfg PROG=mc_rand_walk_2"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_dual_core_cfg PROG=mc_work_share_sort_2"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_quad_core_ucode_cce_cfg PROG=mc_sanity_4"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_quad_core_ucode_cce_cfg PROG=mc_rand_walk_4"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_quad_core_ucode_cce_cfg PROG=mc_work_share_sort_4"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_quad_core_cfg PROG=mc_sanity_4"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_quad_core_cfg PROG=mc_rand_walk_4"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_quad_core_cfg PROG=mc_work_share_sort_4"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_single_core_ucode_cce_cfg PROG=mc_sanity_1"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_single_core_ucode_cce_cfg PROG=mc_rand_walk_1"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_single_core_ucode_cce_cfg PROG=mc_work_share_sort_1"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_single_core_cfg PROG=mc_sanity_1"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_single_core_cfg PROG=mc_rand_walk_1"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_single_core_cfg PROG=mc_work_share_sort_1"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_dual_core_ucode_cce_cfg PROG=mc_sanity_2"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_dual_core_ucode_cce_cfg PROG=mc_rand_walk_2"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_dual_core_ucode_cce_cfg PROG=mc_work_share_sort_2"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_dual_core_cfg PROG=mc_sanity_2"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_dual_core_cfg PROG=mc_rand_walk_2"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_dual_core_cfg PROG=mc_work_share_sort_2"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_quad_core_ucode_cce_cfg PROG=mc_sanity_4"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_quad_core_ucode_cce_cfg PROG=mc_rand_walk_4"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_quad_core_ucode_cce_cfg PROG=mc_work_share_sort_4"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_quad_core_cfg PROG=mc_sanity_4"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_quad_core_cfg PROG=mc_rand_walk_4"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_quad_core_cfg PROG=mc_work_share_sort_4"
)
if [ $1 == "vcs" ]
then
sims+=(
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_oct_core_ucode_cce_cfg PROG=mc_sanity_8"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_oct_core_ucode_cce_cfg PROG=mc_rand_walk_8"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_oct_core_ucode_cce_cfg PROG=mc_work_share_sort_8"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_oct_core_cfg PROG=mc_sanity_8"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_oct_core_cfg PROG=mc_rand_walk_8"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_oct_core_cfg PROG=mc_work_share_sort_8"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_sexta_core_ucode_cce_cfg PROG=mc_sanity_16"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_sexta_core_ucode_cce_cfg PROG=mc_rand_walk_16"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_sexta_core_ucode_cce_cfg PROG=mc_work_share_sort_16"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_sexta_core_cfg PROG=mc_sanity_16"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_sexta_core_cfg PROG=mc_rand_walk_16"
"make -C bp_top/syn sim.${SUFFIX} CFG=e_bp_sexta_core_cfg PROG=mc_work_share_sort_16"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_oct_core_ucode_cce_cfg PROG=mc_sanity_8"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_oct_core_ucode_cce_cfg PROG=mc_rand_walk_8"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_oct_core_ucode_cce_cfg PROG=mc_work_share_sort_8"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_oct_core_cfg PROG=mc_sanity_8"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_oct_core_cfg PROG=mc_rand_walk_8"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_oct_core_cfg PROG=mc_work_share_sort_8"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_sexta_core_ucode_cce_cfg PROG=mc_sanity_16"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_sexta_core_ucode_cce_cfg PROG=mc_rand_walk_16"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_sexta_core_ucode_cce_cfg PROG=mc_work_share_sort_16"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_sexta_core_cfg PROG=mc_sanity_16"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_sexta_core_cfg PROG=mc_rand_walk_16"
"make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests CFG=e_bp_sexta_core_cfg PROG=mc_work_share_sort_16"
)
fi

let JOBS=${#sims[@]}
let CORES_PER_JOB=${N}/${JOBS}+1

# The base command to append the configuration to
build_base="make -C bp_top/syn build.${SUFFIX}"
sim_base="make -C bp_top/syn sim.${SUFFIX} SUITE=bp_tests"

# Any setup needed for the job
make -C bp_top/syn clean.${SUFFIX}

Expand All @@ -93,5 +89,5 @@ parallel --jobs ${JOBS} --results regress_logs --progress "{}" ::: "${builds[@]}
parallel --jobs ${JOBS} --results regress_logs --progress "{}" ::: "${sims[@]}"

# Check for failures in the report directory
grep -cr "FAIL" */syn/reports/ && echo "[CI CHECK] $0: FAILED" && exit 1
grep -cr "FAIL" bp_top/syn/reports/$1 && echo "[CI CHECK] $0: FAILED" && exit 1
echo "[CI CHECK] $0: PASSED" && exit 0

0 comments on commit 42cadcd

Please sign in to comment.