Skip to content

Commit dfe0945

Browse files
Virat AgarwalGitHub Enterprise
Virat Agarwal
authored and
GitHub Enterprise
committed
Updating rtl Makefiles for embedded support
1 parent 8789ac1 commit dfe0945

File tree

102 files changed

+124
-124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+124
-124
lines changed

‎common/utility/makefile_gen/makegen.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ def building_kernel(target, data):
336336
target.write("ifeq ($(HOST_ARCH), x86)\n")
337337
target.write("\t$(VPP) $(VPP_FLAGS) ")
338338
target.write("-l $(VPP_LDFLAGS) --temp_dir ")
339-
target.write("$(TEMP_DIR) ")
339+
target.write("$(TEMP_DIR)")
340340

341341
if "ldclflags" in con:
342342
target.write(" $(VPP_LDFLAGS_"+con["name"]+")")
@@ -346,10 +346,10 @@ def building_kernel(target, data):
346346
target.write("--package.out_dir $(PACKAGE_OUT) -o $(BUILD_DIR)/" + con["name"] + ".xclbin\n")
347347
if not ("platform_type" in data and data["platform_type"] == "pcie"):
348348
target.write("else\n")
349-
target.write("\t$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) ")
349+
target.write("\t$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR)")
350350
if "ldclflags" in con:
351-
target.write(" $(VPP_LDFLAGS_"+con["name"]+") ")
352-
target.write("-o'$(BUILD_DIR)/" + con["name"] + ".xclbin' $(+)\n")
351+
target.write(" $(VPP_LDFLAGS_"+con["name"]+")")
352+
target.write(" -o'$(BUILD_DIR)/" + con["name"] + ".xclbin' $(+)\n")
353353
target.write("endif\n")
354354
target.write("\n")
355355
return
@@ -368,7 +368,7 @@ def building_kernel_rtl(target, data):
368368
target.write("ifeq ($(HOST_ARCH), x86)\n")
369369
target.write("\t$(VPP) $(VPP_FLAGS) ")
370370
target.write("-l $(VPP_LDFLAGS) --temp_dir ")
371-
target.write("$(TEMP_DIR) ")
371+
target.write("$(TEMP_DIR)")
372372

373373
if "ldclflags" in con:
374374
target.write(" $(VPP_LDFLAGS_"+con["name"]+")")
@@ -377,10 +377,10 @@ def building_kernel_rtl(target, data):
377377
target.write("\t$(VPP) -p $(BUILD_DIR)/" + con["name"] + ".link.xclbin -t $(TARGET) --platform $(DEVICE) ")
378378
target.write("--package.out_dir $(PACKAGE_OUT) -o $(BUILD_DIR)/" + con["name"] + ".xclbin\n")
379379
target.write("else\n")
380-
target.write("\t$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) ")
380+
target.write("\t$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR)")
381381
if "ldclflags" in con:
382382
target.write(" $(VPP_LDFLAGS_"+con["name"]+")")
383-
target.write("-o'$(BUILD_DIR)/" + con["name"] + ".xclbin' $(+)\n")
383+
target.write(" -o'$(BUILD_DIR)/" + con["name"] + ".xclbin' $(+)\n")
384384
target.write("endif\n")
385385
return
386386

@@ -411,19 +411,19 @@ def building_kernel_systemc(target, data):
411411
target.write("ifeq ($(HOST_ARCH), x86)\n")
412412
target.write("\t$(VPP) $(VPP_FLAGS) ")
413413
target.write("-l $(VPP_LDFLAGS) --temp_dir ")
414-
target.write("$(TEMP_DIR) ")
414+
target.write("$(TEMP_DIR)")
415415

416-
if "ldclflags" in acc:
416+
if "ldclflags" in con:
417417
target.write(" $(VPP_LDFLAGS_"+con["name"]+")")
418418
target.write(" -o'$(BUILD_DIR)/" + con["name"] + ".link.xclbin' $(+)\n")
419419

420420
target.write("\t$(VPP) -p $(BUILD_DIR)/" + con["name"] + ".link.xclbin -t $(TARGET) --platform $(DEVICE) ")
421421
target.write("--package.out_dir $(PACKAGE_OUT) -o $(BUILD_DIR)/" + con["name"] + ".xclbin\n")
422422
target.write("else\n")
423-
target.write("\t$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) ")
424-
if "ldclflags" in acc:
423+
target.write("\t$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR)")
424+
if "ldclflags" in con:
425425
target.write(" $(VPP_LDFLAGS_"+con["name"]+")")
426-
target.write("-o'$(BUILD_DIR)/" + con["name"] + ".xclbin' $(+)\n")
426+
target.write(" -o'$(BUILD_DIR)/" + con["name"] + ".xclbin' $(+)\n")
427427
target.write("endif\n")
428428
target.write("\n")
429429
return

‎cpp_kernels/array_partition/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ $(TEMP_DIR)/matmul_partition.xo: src/matmul_partition.cpp
141141
$(BUILD_DIR)/matmul.xclbin: $(BINARY_CONTAINER_matmul_OBJS)
142142
mkdir -p $(BUILD_DIR)
143143
ifeq ($(HOST_ARCH), x86)
144-
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/matmul.link.xclbin' $(+)
144+
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/matmul.link.xclbin' $(+)
145145
$(VPP) -p $(BUILD_DIR)/matmul.link.xclbin -t $(TARGET) --platform $(DEVICE) --package.out_dir $(PACKAGE_OUT) -o $(BUILD_DIR)/matmul.xclbin
146146
else
147147
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/matmul.xclbin' $(+)

‎cpp_kernels/bind_op_storage/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ $(TEMP_DIR)/vadd.xo: src/vadd.cpp
143143
$(BUILD_DIR)/vadd.xclbin: $(BINARY_CONTAINER_vadd_OBJS)
144144
mkdir -p $(BUILD_DIR)
145145
ifeq ($(HOST_ARCH), x86)
146-
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/vadd.link.xclbin' $(+)
146+
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/vadd.link.xclbin' $(+)
147147
$(VPP) -p $(BUILD_DIR)/vadd.link.xclbin -t $(TARGET) --platform $(DEVICE) --package.out_dir $(PACKAGE_OUT) -o $(BUILD_DIR)/vadd.xclbin
148148
else
149149
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/vadd.xclbin' $(+)

‎cpp_kernels/burst_rw/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ $(TEMP_DIR)/vadd.xo: src/vadd.cpp
138138
$(BUILD_DIR)/vadd.xclbin: $(BINARY_CONTAINER_vadd_OBJS)
139139
mkdir -p $(BUILD_DIR)
140140
ifeq ($(HOST_ARCH), x86)
141-
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/vadd.link.xclbin' $(+)
141+
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/vadd.link.xclbin' $(+)
142142
$(VPP) -p $(BUILD_DIR)/vadd.link.xclbin -t $(TARGET) --platform $(DEVICE) --package.out_dir $(PACKAGE_OUT) -o $(BUILD_DIR)/vadd.xclbin
143143
else
144144
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/vadd.xclbin' $(+)

‎cpp_kernels/critical_path/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ $(TEMP_DIR)/apply_watermark.xo: src/apply_watermark.cpp
141141
$(BUILD_DIR)/apply_watermark_GOOD.xclbin: $(BINARY_CONTAINER_apply_watermark_GOOD_OBJS)
142142
mkdir -p $(BUILD_DIR)
143143
ifeq ($(HOST_ARCH), x86)
144-
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/apply_watermark_GOOD.link.xclbin' $(+)
144+
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/apply_watermark_GOOD.link.xclbin' $(+)
145145
$(VPP) -p $(BUILD_DIR)/apply_watermark_GOOD.link.xclbin -t $(TARGET) --platform $(DEVICE) --package.out_dir $(PACKAGE_OUT) -o $(BUILD_DIR)/apply_watermark_GOOD.xclbin
146146
else
147147
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/apply_watermark_GOOD.xclbin' $(+)

‎cpp_kernels/custom_datatype/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ $(TEMP_DIR)/rgb_to_hsv.xo: src/rgb_to_hsv.cpp
140140
$(BUILD_DIR)/rgb_to_hsv.xclbin: $(BINARY_CONTAINER_rgb_to_hsv_OBJS)
141141
mkdir -p $(BUILD_DIR)
142142
ifeq ($(HOST_ARCH), x86)
143-
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/rgb_to_hsv.link.xclbin' $(+)
143+
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/rgb_to_hsv.link.xclbin' $(+)
144144
$(VPP) -p $(BUILD_DIR)/rgb_to_hsv.link.xclbin -t $(TARGET) --platform $(DEVICE) --package.out_dir $(PACKAGE_OUT) -o $(BUILD_DIR)/rgb_to_hsv.xclbin
145145
else
146146
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/rgb_to_hsv.xclbin' $(+)

‎cpp_kernels/dataflow_stream/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ $(TEMP_DIR)/adder.xo: src/adder.cpp
137137
$(BUILD_DIR)/adder.xclbin: $(BINARY_CONTAINER_adder_OBJS)
138138
mkdir -p $(BUILD_DIR)
139139
ifeq ($(HOST_ARCH), x86)
140-
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/adder.link.xclbin' $(+)
140+
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/adder.link.xclbin' $(+)
141141
$(VPP) -p $(BUILD_DIR)/adder.link.xclbin -t $(TARGET) --platform $(DEVICE) --package.out_dir $(PACKAGE_OUT) -o $(BUILD_DIR)/adder.xclbin
142142
else
143143
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/adder.xclbin' $(+)

‎cpp_kernels/dataflow_stream_array/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ $(TEMP_DIR)/N_stage_Adders.xo: src/N_stage_adders.cpp
138138
$(BUILD_DIR)/N_stage_Adders.xclbin: $(BINARY_CONTAINER_N_stage_Adders_OBJS)
139139
mkdir -p $(BUILD_DIR)
140140
ifeq ($(HOST_ARCH), x86)
141-
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/N_stage_Adders.link.xclbin' $(+)
141+
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/N_stage_Adders.link.xclbin' $(+)
142142
$(VPP) -p $(BUILD_DIR)/N_stage_Adders.link.xclbin -t $(TARGET) --platform $(DEVICE) --package.out_dir $(PACKAGE_OUT) -o $(BUILD_DIR)/N_stage_Adders.xclbin
143143
else
144144
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/N_stage_Adders.xclbin' $(+)

‎cpp_kernels/dependence_inter/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ $(TEMP_DIR)/vconv.xo: src/vconv.cpp
140140
$(BUILD_DIR)/vconv.xclbin: $(BINARY_CONTAINER_vconv_OBJS)
141141
mkdir -p $(BUILD_DIR)
142142
ifeq ($(HOST_ARCH), x86)
143-
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/vconv.link.xclbin' $(+)
143+
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/vconv.link.xclbin' $(+)
144144
$(VPP) -p $(BUILD_DIR)/vconv.link.xclbin -t $(TARGET) --platform $(DEVICE) --package.out_dir $(PACKAGE_OUT) -o $(BUILD_DIR)/vconv.xclbin
145145
else
146146
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) -o'$(BUILD_DIR)/vconv.xclbin' $(+)

‎cpp_kernels/gmem_2banks/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ $(TEMP_DIR)/apply_watermark.xo: src/apply_watermark.cpp
157157
$(VPP) $(VPP_FLAGS) $(VPP_FLAGS_apply_watermark) -c -k apply_watermark --temp_dir $(TEMP_DIR) -I'$(<D)' -o'$@' '$<'
158158
$(BUILD_DIR)/apply_watermark.xclbin: $(BINARY_CONTAINER_apply_watermark_OBJS)
159159
mkdir -p $(BUILD_DIR)
160-
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) $(VPP_LDFLAGS_apply_watermark) -o'$(BUILD_DIR)/apply_watermark.link.xclbin' $(+)
160+
$(VPP) $(VPP_FLAGS) -l $(VPP_LDFLAGS) --temp_dir $(TEMP_DIR) $(VPP_LDFLAGS_apply_watermark) -o'$(BUILD_DIR)/apply_watermark.link.xclbin' $(+)
161161
$(VPP) -p $(BUILD_DIR)/apply_watermark.link.xclbin -t $(TARGET) --platform $(DEVICE) --package.out_dir $(PACKAGE_OUT) -o $(BUILD_DIR)/apply_watermark.xclbin
162162

163163
############################## Setting Rules for Host (Building Host Executable) ##############################

0 commit comments

Comments
 (0)