Skip to content

Pim+host prefixsum #287

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Pim+host prefixsum #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
799f8a9
updated prefixsum
May 18, 2025
4967c18
updated_prefixsum
May 20, 2025
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
39 changes: 39 additions & 0 deletions misc-bench/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,42 @@
<<<<<<< HEAD
# Makefile for PIMeval Simulator - Applications
=======
<<<<<<< HEAD
# Makefile for PIMeval / PIMbench Framework
=======
# Makefile for PIMeval Simulator - Applications
>>>>>>> 556bf46 (host_PIM_Prefixsum)
>>>>>>> 14b1d2b (host_PIM_Prefixsum)
Comment on lines +1 to +9
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like there's unresolved merge conflict at the top of the Makefile. The conflict markers (<<<<<<<, =======, >>>>>>>) need to be removed and the appropriate header should be chosen.
Please resolve the conflict.

# Copyright (c) 2024 University of Virginia
# This file is licensed under the MIT License.
# See the LICENSE file in the root of this repository for more details.

<<<<<<< HEAD
SUBDIRS := $(wildcard */.)
=======
<<<<<<< HEAD
LIBDIR := libpimeval
BITSERIALDIR := bit-serial
APPDIR := PIMbench
TESTDIR := misc-bench tests
ALLDIRS := $(LIBDIR) $(BITSERIALDIR) $(APPDIR) $(TESTDIR)
>>>>>>> 14b1d2b (host_PIM_Prefixsum)

.PHONY: debug perf dramsim3_integ clean $(SUBDIRS)
.DEFAULT_GOAL := perf

USE_OPENMP ?= 0

COMPILE_WITH_JPEG ?= 0

debug: $(SUBDIRS)
@echo "INFO: apps target = debug"

<<<<<<< HEAD
=======
$(BITSERIALDIR) $(APPDIR) $(TESTDIR): $(DEP_LIBPIMEVAL)
$(MAKE) -C $@ $(MAKECMDGOALS) PIM_SIM_TARGET=$(PIM_SIM_TARGET) USE_OPENMP=$(USE_OPENMP) COMPILE_WITH_JPEG=$(COMPILE_WITH_JPEG)
=======
SUBDIRS := $(wildcard */.)

.PHONY: debug perf dramsim3_integ clean $(SUBDIRS)
Expand All @@ -15,6 +49,7 @@ COMPILE_WITH_JPEG ?= 0
debug: $(SUBDIRS)
@echo "INFO: apps target = debug"

>>>>>>> 14b1d2b (host_PIM_Prefixsum)
perf: $(SUBDIRS)
@echo "INFO: apps target = perf"

Expand All @@ -25,4 +60,8 @@ clean: $(SUBDIRS)

$(SUBDIRS):
$(MAKE) -C $@ $(MAKECMDGOALS) USE_OPENMP=$(USE_OPENMP) COMPILE_WITH_JPEG=$(COMPILE_WITH_JPEG)
<<<<<<< HEAD
=======
>>>>>>> 556bf46 (host_PIM_Prefixsum)
>>>>>>> 14b1d2b (host_PIM_Prefixsum)

Loading