Xilinx
diff --git a/‎vision/.clang-format‎
Lines changed: 88 additions & 0 deletions b/‎vision/.clang-format‎
Lines changed: 88 additions & 0 deletions
diff --git a/‎vision/Jenkinsfile‎
Lines changed: 1 addition & 1 deletion b/‎vision/Jenkinsfile‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎vision/L1/examples/3dlut/Makefile‎
Lines changed: 257 additions & 0 deletions b/‎vision/L1/examples/3dlut/Makefile‎
Lines changed: 257 additions & 0 deletions
diff --git a/‎vision/L1/examples/3dlut/build/xf_config_params.h‎
Lines changed: 23 additions & 0 deletions b/‎vision/L1/examples/3dlut/build/xf_config_params.h‎
Lines changed: 23 additions & 0 deletions
@@ -0,0 +1,88 @@
+---
+Language:        Cpp
+AccessModifierOffset: -1
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlinesLeft: true
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: true
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: true
+BinPackParameters: false
+BraceWrapping:
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+ColumnLimit:     120
+CommentPragmas:  '^ IWYU pragma:'
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeCategories: 
+  - Regex:           '^<.*\.h>'
+    Priority:        1
+  - Regex:           '^<.*'
+    Priority:        2
+  - Regex:           '.*'
+    Priority:        3
+IndentCaseLabels: true
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 4
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: false
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Left
+ReflowComments:  true
+SortIncludes:    false
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp03
+TabWidth:        8
+UseTab:          Never
+...
@@ -1,4 +1,4 @@
 @Library('pipeline-library')_
 
 VitisLibPipeline (branch: 'next', libname: 'xf_opencv', TARGETS: 'hls_csim:hls_csynth:hls_cosim:vitis_sw_emu:vitis_hw_emu',
-                  email: 'badermd@xilinx.com', devtest: 'RunDeploy.sh', TOOLVERSION: '2020.2_stable_latest')
+                  email: 'badermd@xilinx.com', devtest: 'RunDeploy.sh', TOOLVERSION: '2021.1_stable_latest')
@@ -0,0 +1,257 @@
+#
+# Copyright 2021 Xilinx, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+MK_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
+CUR_DIR := $(patsubst %/,%,$(dir $(MK_PATH)))
+XF_PROJ_ROOT ?= $(shell bash -c 'export MK_PATH=$(MK_PATH); echo $${MK_PATH%L1/examples/*}')
+
+# MK_INC_BEGIN hls_common.mk
+
+.PHONY: help
+
+help::
+	@echo ""
+	@echo "Makefile Usage:"
+	@echo ""
+	@echo "  make run CSIM=1 CSYNTH=1 COSIM=1 DEVICE=<FPGA platform> PLATFORM_REPO_PATHS=<path to platform directories>"
+	@echo "      Command to run the selected tasks for specified device."
+	@echo ""
+	@echo "      Valid tasks are CSIM, CSYNTH, COSIM, VIVADO_SYN, VIVADO_IMPL"
+	@echo ""
+	@echo "      DEVICE is case-insensitive and support awk regex."
+	@echo "      For example, \`make run DEVICE='u200.*xdma' COSIM=1\`"
+	@echo "      It can also be an absolute path to platform file."
+	@echo ""
+	@echo "      PLATFORM_REPO_PATHS variable is used to specify the paths in which the platform files will be"
+	@echo "      searched for."
+	@echo ""
+	@echo "  make run CSIM=1 CSYNTH=1 COSIM=1 XPART=<FPGA part name>"
+	@echo "      Alternatively, the FPGA part can be speficied via XPART."
+	@echo "      For example, \`make run XPART='xcu200-fsgd2104-2-e' COSIM=1\`"
+	@echo "      When XPART is set, DEVICE will be ignored."
+	@echo ""
+	@echo "  make clean "
+	@echo "      Command to remove the generated files."
+	@echo ""
+
+# MK_INC_END hls_common.mk
+
+# MK_INC_BEGIN vivado.mk
+
+TOOL_VERSION ?= 2021.1
+
+ifeq (,$(XILINX_VIVADO))
+XILINX_VIVADO = /opt/xilinx/Vivado/$(TOOL_VERSION)
+endif
+export XILINX_VIVADO
+
+.PHONY: check_vivado
+check_vivado:
+ifeq (,$(wildcard $(XILINX_VIVADO)/bin/vivado))
+	@echo "Cannot locate Vivado installation. Please set XILINX_VIVADO variable." && false
+endif
+
+export PATH := $(XILINX_VIVADO)/bin:$(PATH)
+
+# MK_INC_END vivado.mk
+
+DEVICE ?= u200
+
+# MK_INC_BEGIN vitis_set_part.mk
+
+.PHONY: check_part
+
+ifeq (,$(XPART))
+# MK_INC_BEGIN vitis.mk
+
+TOOL_VERSION ?= 2021.1
+
+ifeq (,$(XILINX_VITIS))
+XILINX_VITIS = /opt/xilinx/Vitis/$(TOOL_VERSION)
+endif
+export XILINX_VITIS
+.PHONY: check_vpp
+check_vpp:
+ifeq (,$(wildcard $(XILINX_VITIS)/bin/v++))
+	@echo "Cannot locate Vitis installation. Please set XILINX_VITIS variable." && false
+endif
+
+ifeq (,$(XILINX_XRT))
+XILINX_XRT = /opt/xilinx/xrt
+endif
+export XILINX_XRT
+.PHONY: check_xrt
+check_xrt:
+ifeq (,$(wildcard $(XILINX_XRT)/lib/libxilinxopencl.so))
+	@echo "Cannot locate XRT installation. Please set XILINX_XRT variable." && false
+endif
+
+.PHONY: check_opencv
+check_opencv:
+ifeq (,$(OPENCV_INCLUDE))
+	@echo "Cannot find OpenCV include path. Please set OPENCV_INCLUDE variable" && false
+endif
+ifeq (,$(OPENCV_LIB))
+	@echo "Cannot find Opencv lib path. Please set OPENCV_LIB variable" && false
+endif
+
+export PATH := $(XILINX_VITIS)/bin:$(XILINX_XRT)/bin:$(PATH)
+
+ifeq (,$(LD_LIBRARY_PATH))
+LD_LIBRARY_PATH := $(XILINX_XRT)/lib
+else
+LD_LIBRARY_PATH := $(XILINX_XRT)/lib:$(LD_LIBRARY_PATH)
+endif
+ifneq (,$(wildcard $(XILINX_VITIS)/bin/ldlibpath.sh))
+export LD_LIBRARY_PATH := $(shell $(XILINX_VITIS)/bin/ldlibpath.sh $(XILINX_VITIS)/lib/lnx64.o):$(LD_LIBRARY_PATH)
+endif
+
+# MK_INC_END vitis.mk
+# MK_INC_BEGIN vitis_set_platform.mk
+
+ifneq (,$(wildcard $(DEVICE)))
+# Use DEVICE as a file path
+XPLATFORM := $(DEVICE)
+else
+# Use DEVICE as a file name pattern
+DEVICE_L := $(shell echo $(DEVICE) | tr A-Z a-z)
+# Match the name
+ifneq (,$(PLATFORM_REPO_PATHS))
+XPLATFORMS := $(foreach p, $(subst :, ,$(PLATFORM_REPO_PATHS)), $(wildcard $(p)/*/*.xpfm))
+XPLATFORM := $(strip $(foreach p, $(XPLATFORMS), $(shell echo $(p) | awk '$$1 ~ /$(DEVICE_L)/')))
+endif
+ifeq (,$(XPLATFORM))
+XPLATFORMS := $(wildcard $(XILINX_VITIS)/platforms/*/*.xpfm)
+XPLATFORM := $(strip $(foreach p, $(XPLATFORMS), $(shell echo $(p) | awk '$$1 ~ /$(DEVICE_L)/')))
+endif
+ifeq (,$(XPLATFORM))
+XPLATFORMS := $(wildcard /opt/xilinx/platforms/*/*.xpfm)
+XPLATFORM := $(strip $(foreach p, $(XPLATFORMS), $(shell echo $(p) | awk '$$1 ~ /$(DEVICE_L)/')))
+endif
+endif
+
+define MSG_PLATFORM
+No platform matched pattern '$(DEVICE)'.
+Available platforms are: $(XPLATFORMS)
+To add more platform directories, set the PLATFORM_REPO_PATHS variable.
+endef
+export MSG_PLATFORM
+
+define MSG_DEVICE
+More than one platform matched: $(XPLATFORM)
+Please set DEVICE variable more accurately to select only one platform file. For example: DEVICE='u200.*xdma'
+endef
+export MSG_DEVICE
+
+.PHONY: check_platform
+check_platform:
+ifeq (,$(XPLATFORM))
+	@echo "$${MSG_PLATFORM}" && false
+endif
+ifneq (,$(word 2,$(XPLATFORM)))
+	@echo "$${MSG_DEVICE}" && false
+endif
+
+XDEVICE := $(basename $(notdir $(firstword $(XPLATFORM))))
+
+# MK_INC_END vitis_set_platform.mk
+ifeq (1, $(words $(XPLATFORM)))
+# Query the part name of device
+ifneq (,$(wildcard $(XILINX_VITIS)/bin/platforminfo))
+override XPART := $(shell $(XILINX_VITIS)/bin/platforminfo --json="hardwarePlatform.devices[0].fpgaPart" --platform $(firstword $(XPLATFORM)) | sed 's/^[^:]*://g' | sed 's/[^a-zA-Z0-9]/-/g' | sed 's/-\+/-/g')
+endif
+endif
+check_part: check_platform check_vpp
+ifeq (,$(XPART))
+	@echo "XPART is not set and cannot be inferred. Please run \`make help\` for usage info." && false
+endif
+else # XPART
+check_part:
+	@echo "XPART is directly set to $(XPART)"
+endif # XPART
+
+# MK_INC_END vitis_set_part.mk
+
+# MK_INC_BEGIN hls_test_rules.mk
+
+
+.PHONY: run setup runhls clean cleanall check
+
+# Alias to run, for legacy test script
+check: run
+
+CSIM ?= 0
+CSYNTH ?= 0
+COSIM ?= 0
+VIVADO_SYN ?= 0
+VIVADO_IMPL ?= 0
+QOR_CHECK ?= 0
+
+# at least RTL synthesis before check QoR
+ifeq (1,$(QOR_CHECK))
+ifeq (0,$(VIVADO_IMPL))
+override VIVADO_SYN := 1
+endif
+endif
+
+# need synthesis before cosim or vivado
+ifeq (1,$(VIVADO_IMPL))
+override CSYNTH := 1
+endif
+
+ifeq (1,$(VIVADO_SYN))
+override CSYNTH := 1
+endif
+
+ifeq (1,$(COSIM))
+override CSYNTH := 1
+endif
+
+# From testbench.data_recipe of description.json
+data:
+	@true
+
+run: data setup runhls
+
+setup: | check_part check_opencv
+	@rm -f ./settings.tcl
+	@if [ -n "$$CLKP" ]; then echo 'set CLKP $(CLKP)' >> ./settings.tcl ; fi
+	@echo 'set XPART $(XPART)' >> ./settings.tcl
+	@echo 'set CSIM $(CSIM)' >> ./settings.tcl
+	@echo 'set CSYNTH $(CSYNTH)' >> ./settings.tcl
+	@echo 'set COSIM $(COSIM)' >> ./settings.tcl
+	@echo 'set VIVADO_SYN $(VIVADO_SYN)' >> ./settings.tcl
+	@echo 'set VIVADO_IMPL $(VIVADO_IMPL)' >> ./settings.tcl
+	@echo 'set XF_PROJ_ROOT "$(XF_PROJ_ROOT)"' >> ./settings.tcl
+	@echo 'set OPENCV_INCLUDE "$(OPENCV_INCLUDE)"' >> ./settings.tcl
+	@echo 'set OPENCV_LIB "$(OPENCV_LIB)"' >> ./settings.tcl
+	@echo 'set CUR_DIR "$(CUR_DIR)"' >> ./settings.tcl
+	@echo "Configured: settings.tcl"
+	@echo "----"
+	@cat ./settings.tcl
+	@echo "----"
+
+HLS ?= vitis_hls
+runhls: data setup | check_vivado check_vpp
+	$(HLS) -f run_hls.tcl;
+
+clean:
+	rm -rf settings.tcl *_hls.log lut3d.prj
+
+# Used by Jenkins test
+cleanall: clean
+
+# MK_INC_END hls_test_rules.mk
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2021 Xilinx, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define WIDTH 1920  // 7680//3840//
+#define HEIGHT 1080 // 4320//2160//
+#define NPPC XF_NPPC1
+
+#define T_8U 1
+
+#define XF_USE_URAM 0