Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split the obs_o pins at occamy_chip and occamy_xilinx #88

Closed
wants to merge 1 commit into from
Closed

Split the obs_o pins at occamy_chip and occamy_xilinx #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions hw/occamy/occamy_chip.sv.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ import ${name}_pkg::*;
(
input logic clk_i,
input logic rst_ni,
// Obs pins
output obs_t obs_o,
/// Observe Pins
%for i in range(obs_num):
output logic [${obs_pin_width-1}:0] obs_${i}_o,
%endfor
/// Peripheral clock
input logic clk_periph_i,
input logic rst_periph_ni,
Expand Down Expand Up @@ -140,11 +142,12 @@ import ${name}_pkg::*;
///////////////////
// Occamy Top //
///////////////////
obs_t obs_pin;

${name}_top i_${name} (
.clk_i (clk_i),
.rst_ni (rst_ni),
.obs_o (obs_o),
.obs_o (obs_pin),
.sram_cfgs_i ('0),
.clk_periph_i (clk_periph_i),
.rst_periph_ni (rst_periph_ni),
Expand Down Expand Up @@ -193,4 +196,8 @@ import ${name}_pkg::*;
.ext_irq_i ('0)
);

endmodule
%for i in range(obs_num):
assign obs_${i}_o = obs_pin[${i}];
%endfor

endmodule
7 changes: 5 additions & 2 deletions hw/occamy/occamy_xilinx.sv.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ import ${name}_pkg::*;
/// Peripheral clock
input logic clk_periph_i,
input logic rst_periph_ni,
/// Observe Pins
%for i in range(obs_num):
output logic [${obs_pin_width-1}:0] obs_${i}_o,
%endfor
/// Real-time clock (for time keeping)
input logic rtc_i,
input logic test_mode_i,
Expand Down Expand Up @@ -116,7 +120,6 @@ import ${name}_pkg::*;
end
end


// Occamy top-level
${name}_top i_${name} (
.bootrom_req_o (bootrom_axi_lite_req),
Expand All @@ -129,4 +132,4 @@ import ${name}_pkg::*;
.*
);

endmodule
endmodule
44 changes: 9 additions & 35 deletions util/occamygen/occamy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,9 +482,13 @@ def get_quadrant_kwargs(occamy_cfg, cluster_generators, soc_wide_xbar, soc_narro
return quadrant_kwargs


def get_xilinx_kwargs(occamy_cfg, soc_wide_xbar, soc_axi_lite_narrow_periph_xbar, name):
def get_xilinx_kwargs(occamy_cfg, cluster_generators, soc_wide_xbar, soc_axi_lite_narrow_periph_xbar, name):
cluster_cfg = cluster_generators[0].cfg

xilinx_kwargs = {
"name": name,
"obs_pin_width": cluster_cfg["observable_pin_width"],
"obs_num": len(occamy_cfg["clusters"]),
"occamy_cfg": occamy_cfg,
"soc_wide_xbar": soc_wide_xbar,
"soc_axi_lite_narrow_periph_xbar": soc_axi_lite_narrow_periph_xbar
Expand Down Expand Up @@ -569,39 +573,6 @@ def get_cheader_kwargs(occamy_cfg, cluster_generators, name):
"Not all cluster base offset in the cluster cfg are equal.")
cluster_offset = cluster_offset_list[0]
cluster_addr_width = int(math.log2(cluster_offset))
# # The lut here is to provide an easy way to determine the cluster idx based on core idx
# # e.g core_per_cluster_list = [2,3]
# # core_idx lut cluster_idx
# # 0 lut[0] 0
# # 1 lut[1] 0
# # 2 lut[2] 1
# # 3 lut[3] 1
# # 4 lut[4] 1
# lut = []
# for cluster_num, num_cores in enumerate(core_per_cluster_list):
# lut.extend([cluster_num] * num_cores)
# running_sum = []
# current_sum = 0
# for core in core_per_cluster_list:
# current_sum += core
# running_sum.append(current_sum)
# cluster_baseidx = [0] + running_sum[:-1]
# # we need to define an array in c header file for each cluster like
# # #define N_CORES_PER_CLUSTER {2,3}
# # so here we need to take out the value of the core_per_cluster_list
# # and join them with commas and then finally concat with {}
# nr_cores_per_cluster = "{" + ",".join(map(str, core_per_cluster_list)) + "}"
# lut_coreidx_clusteridx = "{" + ",".join(map(str, lut)) + "}"
# cluster_baseidx = "{" + ",".join(map(str, cluster_baseidx)) + "}"
# cheader_kwargs={
# "name": name,
# "nr_quads": nr_quads,
# "nr_clusters": nr_clusters,
# "nr_cores_per_cluster": nr_cores_per_cluster,
# "lut_coreidx_clusteridx": lut_coreidx_clusteridx,
# "cluster_baseidx": cluster_baseidx,
# "nr_cores": nr_cores
# }
cheader_kwargs = {
"name": name,
"nr_quads": nr_quads,
Expand Down Expand Up @@ -658,12 +629,15 @@ def get_chip_kwargs(soc_wide_xbar, soc_axi_lite_narrow_periph_xbar, occamy_cfg,
for cluster_generator in cluster_generators]
nr_cores_quadrant = sum(core_per_cluster_list)
nr_s1_quadrants = occamy_cfg["nr_s1_quadrant"]
cluster_cfg = cluster_generators[0].cfg
chip_kwargs = {
"name": name,
"util": util,
"occamy_cfg": occamy_cfg,
"soc_wide_xbar": soc_wide_xbar,
"soc_axi_lite_narrow_periph_xbar": soc_axi_lite_narrow_periph_xbar,
"obs_pin_width": cluster_cfg["observable_pin_width"],
"obs_num": len(occamy_cfg["clusters"]),
"cores": nr_s1_quadrants * nr_cores_quadrant + 1
}
return chip_kwargs
Expand All @@ -689,4 +663,4 @@ def get_ctrl_kwargs(occamy_cfg, name):
"occamy_cfg": occamy_cfg,
"addr_width": addr_width
}
return ctrl_kwargs
return ctrl_kwargs
4 changes: 2 additions & 2 deletions util/occamygen/occamygen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@ def main():
##################
if args.xilinx_sv:
xilinx_kwargs = occamy.get_xilinx_kwargs(
occamy_cfg, soc_wide_xbar, soc_axi_lite_narrow_periph_xbar, args.name)
occamy_cfg, cluster_generators, soc_wide_xbar, soc_axi_lite_narrow_periph_xbar, args.name)
write_template(args.xilinx_sv,
outdir,
fname="{}_xilinx.sv".format(args.name),
Expand Down Expand Up @@ -657,4 +657,4 @@ def main():


if __name__ == "__main__":
main()
main()
Loading