finish lab3_hls

can run

Author: nightt5879

README.md

@@ -16,8 +16,8 @@
     - [3.6 实验 6](#36-实验-6)
   - [4.HLS\_lab](#4hls_lab)
   - [4.1 实验1](#41-实验1)
-  - [4.2 实验2(linux问题)](#42-实验2linux问题)
-  - [4.3 实验3(linux问题)](#43-实验3linux问题)
+  - [4.2 实验2](#42-实验2)
+  - [4.3 实验3](#43-实验3)
   - [4.4 实验4](#44-实验4)
   - [5.课程设计（开发中）](#5课程设计开发中)
 - [勘误](#勘误)
@@ -477,9 +477,24 @@ clogb2(DIVIDER)的作用是计算DIVIDER的二进制位数，这样就可以得
 ## 4.1 实验1
 这个实验可以注意到有很多个版本，首先是最原始的使用vivadoHLS的版本，这个适用较老的工具。其次是Vitis HLS的版本，这个适用于较新的工具。还有最新的Vitis版本，这个版本我使用跑完了实验1同时有一个教学文档。</p>
 > **Vitis的教学文档** [Vitis开发lab1](./datasheet/lab1_vitis.pdf)
-## 4.2 实验2(linux问题)
-## 4.3 实验3(linux问题)
+## 4.2 实验2
+可与使用强制命令打开Vitis_HLS软件的项目，使用代码:</p>
+```
+vitis_hls -p <your prj name> -classic
+```
+请注意，要使用Vitis_HLS的命令行工具完成该操作。
+    <p align="center">
+    <img src ="./images/Figure1.jpg">
+    </p>
+    <p align = "center">
+    <i>打开会提示GUI未来将会弃用</i>
+    </p>
+<sub>本人遇到一定的小问题无法正常打开，但是这个流程操作应该是没有太大问题的</sub>
+## 4.3 实验3
+make之后可以使用类似于lab1的教程部分，使用Vitis进行操作，可以跟着跑完流程。</p>
+几乎一样 只是前面的选择文件还有top_function命名之类的不一样而已。
 ## 4.4 实验4
+官方仓库有一个是直接打包好的prj，使用Vitis的terminal直接编译TCL文件即可直接输出最后的IP核文件。
 
 ## 5.课程设计（开发中）
 

ZedBoard/HLS_lab/lab2/.wsdata/clang_dir_map.json

@@ -0,0 +1,108 @@
+# MIT License
+# Copyright (c) 2022 Advanced Micro Devices, Inc. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# SOFTWARE.
+# makefile-generator v1.0.3
+
+# ######################################################
+# Define design information
+# - assumes the design files are .c (update to .cpp for C++ and SystemC)
+# - assumes test bench is <design>_test.c
+
+DESIGN		 := yuv_filter
+SOURCES		 := $(DESIGN).c $(DESIGN)_test.c image_aux.c
+OBJECTS		 := $(SOURCES:.c=.o)
+INCLUDES		 := $(DESIGN).h image_aux.h
+CLEAN_FILES  := $(OBJECTS) $(DESIGN) $(DESIGN).exe
+CLEAN_FILES  += test_data/output.dat
+VIVADO_HLS_CLEANUP := $(DESIGN)_prj $(DESIGN).log vivado_hls.log 
+# Change to true if using ap[u]int in ISO-C project
+USE_ARBITRARY_PRECISION = false
+# Change to true if using SystemC types or SC_MODULE, etc.
+USE_SYSTEMC 				= false
+
+# ######################################################
+# Automatically setup the software paths
+SHELL           := sh
+KERNEL          := Win
+ARCH            := x86_64
+OS              := $(KERNEL)_$(ARCH)
+
+# Vitis HLS specific configuration
+VITIS_HLS_EXE_FILENAME := vitis_hls.exe  # For Windows; use vitis_hls for Linux
+APCC= $(VITIS_HLS_ROOT)/$(OS)/bin/apcc_bin.exe
+
+# Directly reference the Vitis HLS executable
+VITIS_HLS_EXE := E:/vivado/Vitis/2024.1/bin/vitis_hls.exe
+
+VITIS_HLS_ROOT := $(VITIS_HLS_EXE:/bin/$(VITIS_HLS_EXE_FILENAME)=)
+
+# Include and library paths
+VITIS_HLS_INC_PATH := $(VITIS_HLS_ROOT)/include
+SYSTEMC_INC_PATH := $(VITIS_HLS_ROOT)/$(OS)/tools/systemc/include
+SYSTEMC_LIB_PATH := $(VITIS_HLS_ROOT)/$(OS)/tools/systemc/lib
+
+
+# ######################################################
+# Setup C compiler and options
+#
+# Use APCC for ISO-C projects that use ap[u]int types; gcc otherwise
+ifeq ($(USE_ARBITRARY_PRECISION),true)
+CC				:= $(APCC)
+CFLAGS		+= -DBIT_ACCURATE
+else
+CC				:= gcc
+endif
+CXX			:= g++
+# C compiler flags
+CFLAGS		+= -ggdb
+CFLAGS		+= -w
+CFLAGS		+= -I$(VIVADO_HLS_INC_PATH)
+# C++ compiler flags
+CXXFLAGS		+= -ggdb
+CXXFLAGS		+= -I$(VIVADO_HLS_INC_PATH)
+# Linker flags
+LDFLAGS		+= -lm 
+# # SystemC additional flags
+ifeq ($(USE_SYSTEMC), true)
+CXXFLAGS		+= -I$(SYSTEMC_INC_PATH)
+LDFLAGS		+= -L$(SYSTEMC_LIB_PATH)
+LDLIBS		+= -lsystemc
+endif
+
+# ######################################################
+# Rules
+
+all: sim
+
+clean:
+	rm -rf $(CLEAN_FILES) $(VIVADO_HLS_CLEANUP)
+
+VIVADO_HLS: $(DESIGN).tcl
+	vitis_hls $<
+
+sim: $(DESIGN)
+	./$(DESIGN)
+
+$(DESIGN): $(OBJECTS)
+# Uses implicit recipes, i.e.:
+# $([CC|CXX]) $(CPPFLAGS) $([CFLAGS|CXXFLAGS]) -c # For each SOURCE
+# $(CC) $(LDFLAGS) $(OBJECTS) $(LOADLIBES) $(LDLIBS) # To link OBJECTS
+
+# TODO: add rule to rebuild OBJECT when its .h file changes

ZedBoard/HLS_lab/lab2/Makefile

@@ -0,0 +1,84 @@
+// MIT License
+// Copyright (c) 2022 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// SOFTWARE.
+#include <stdio.h>
+#include "image_aux.h"
+
+
+void image_read (
+      image_t *in_image
+      ) {
+   image_dim_t width, height;
+   int x, y;
+   FILE        *fp;
+
+   fp=fopen("test_data/input.dat","r");
+   int tmp;
+   fscanf(fp, "%d", &tmp);
+   width = tmp;
+   fscanf(fp, "%d", &tmp);
+   height = tmp;
+
+   in_image->width  = width;
+   in_image->height = height;
+   for (x=0;x<width;x++) {
+      for (y=0;y<height;y++) {
+         fscanf(fp, "%d", &tmp);
+         in_image->channels.ch1[x][y] = tmp;
+         fscanf(fp, "%d", &tmp);
+         in_image->channels.ch2[x][y] = tmp;
+         fscanf(fp, "%d", &tmp);
+         in_image->channels.ch3[x][y] = tmp;
+      }
+   }
+   fclose(fp);
+
+}
+
+
+void image_write (
+      image_t *out_image
+      ) {
+   FILE *fp;
+   int x, y;
+   image_dim_t width, height;
+   image_pix_t tmp;
+
+   fp=fopen("test_data/output.dat","w");
+
+   width = out_image->width;
+   fprintf(fp, "%d \n", width);
+
+   height = out_image->height;
+   fprintf(fp, "%d \n", height);
+
+   for (y=0;y<height;y++) {
+      /* Scan-line: */
+      for (x=0;x<width;x++) {
+         tmp = out_image->channels.ch1[x][y];
+         fprintf(fp, "%d\n", tmp);
+         tmp = out_image->channels.ch2[x][y];
+         fprintf(fp, "%d\n", tmp);
+         tmp = out_image->channels.ch3[x][y];
+         fprintf(fp, "%d\n", tmp);
+      }
+   }
+   fclose(fp);
+}

ZedBoard/HLS_lab/lab2/image_aux.c

@@ -0,0 +1,56 @@
+// MIT License
+// Copyright (c) 2022 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// SOFTWARE.
+#ifndef IMAGE_AUX_H_
+#define IMAGE_AUX_H_
+
+#ifdef BIT_ACCURATE
+#include "autopilot_tech.h"
+
+typedef uint8  image_pix_t;
+typedef uint11 image_dim_t;
+
+#else // Use native C types
+
+typedef unsigned char  image_pix_t;
+typedef unsigned short image_dim_t;
+
+#endif // ifdef BIT_ACCURATE
+
+#define WIDTH 1920
+#define HEIGHT 1280
+
+typedef struct {
+   image_pix_t ch1[WIDTH][HEIGHT];
+   image_pix_t ch2[WIDTH][HEIGHT];
+   image_pix_t ch3[WIDTH][HEIGHT];
+} channel_t;
+
+typedef struct {
+   channel_t channels;
+   image_dim_t width;
+   image_dim_t height;
+} image_t;
+
+void image_read(image_t *in_image);
+
+void image_write(image_t *out_image);
+
+#endif