Skip to content
Snippets Groups Projects
Commit 5e76f110 authored by Hashim Sharif's avatar Hashim Sharif
Browse files

Merging in Hotfix fixes in (Automated Tests)

parents 74057b75 1ffec54e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
hpvm/scripts/hpvm_installer.py
+ 5
− 1
View file @ 5e76f110
......@@ -120,11 +120,15 @@ def prompt_args():
"Build target: ", parse_targets, "Input shouldn't contain space"
)
download_weights = input_with_check(
"Download DNN weights (recommended)? [y/n]: ", parse_yn, "Please enter y or n"
)
run_tests = input_with_check(
"Build and run tests? [y/n]: ", parse_yn, "Please enter y or n"
)
return Namespace(
no_build=not auto_build, parallel=threads, targets=targets, run_tests=run_tests
no_build=not auto_build, parallel=threads, targets=targets, run_tests=run_tests,
no_params=not download_weights
)
......
hpvm/test/dnn_benchmarks/hpvm-c/check_dnn_acc.py
+ 1
− 1
View file @ 5e76f110
......@@ -16,7 +16,7 @@ network_accuracies = {
def almost_equal(x1, x2):
return abs(x1 - x2) < 1e-4
return abs(x1 - x2) < 5e-2
_, acc_file, network_name = argv
......
hpvm/test/hpvm_pass/DFG2LLVM_WrapperAPI/wrapGroupPoolSoftmax.ll deleted 100644 → 0
+ 0
− 164
View file @ 74057b75
; RUN: opt -load LLVMBuildDFG.so -load LLVMInPlaceDFGAnalysis.so -load LLVMDFG2LLVM_WrapperAPI.so -S -inplace -dfg2llvm-wrapperapi --configuration-inputs-filename=conf_file.txt < %s | FileCheck %s
; ModuleID = 'groupPoolSoftmax.hpvm.ll'
source_filename = "groupPoolSoftmax.cpp"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
%struct.out._Z14groupConv_nodePvmS_m = type <{ i8*, i64 }>
%struct.out._Z12softmax_nodePvm = type <{ i8*, i64 }>
%struct.out._Z13pool_max_nodePvm = type <{ i8*, i64 }>
%struct.out._Z4rootPvmS_m = type <{ i8*, i64 }>
; CHECK-LABEL: i32 @main(
; CHECK: call void @llvm_hpvm_initApproxhpvmRt(i32 0)
; CHECK-NEXT: call void @llvm_hpvm_initializeRuntimeController(
; CHECK-NEXT: call void @llvm.hpvm.init()
; CHECK: call void @hpvm_request_tensor(
; CHECK: call void @llvm_hpvm_cleanupApproxhpvmRt()
; CHECK: call void @llvm_hpvm_clearRuntimeController()
; CHECK-NEXT: call void @llvm.hpvm.cleanup()
; CHECK-LABEL: @_Z14groupConv_nodePvmS_m_cloned_wrapper_api(
; CHECK: call void @hpvm_request_tensor(
; CHECK: call void @hpvm_request_tensor(
; CHECK: call i8* @wrapper_tensorGroupConvolution(i8* getelementptr inbounds ([2 x i8], [2 x i8]* @2, i32 0, i32 0), i8* %t1, i8* %t2, i32 1, i32 1, i32 1, i32 1, i32 1, i32 32)
; CHECK: ret
; CHECK-LABEL: @_Z13pool_max_nodePvm_cloned_wrapper_api(
; CHECK: call void @hpvm_request_tensor(
; CHECK: call i8* @wrapper_tensorPooling(i8* getelementptr inbounds ([2 x i8], [2 x i8]* @3, i32 0, i32 0), i8* %t1, i32 0, i32 2, i32 2, i32 0, i32 0, i32 2, i32 2)
; CHECK: ret
; CHECK-LABEL: @_Z12softmax_nodePvm_cloned_wrapper_api(
; CHECK: call void @hpvm_request_tensor(
; CHECK: call i8* @wrapper_tensorSoftmax(
; CHECK: ret
; Function Attrs: norecurse uwtable
define dso_local i32 @main() local_unnamed_addr #0 {
entry:
call void @llvm.hpvm.init()
%call = tail call noalias i8* @malloc(i64 48) #3
%graphID = call i8* @llvm.hpvm.launch(i8* bitcast (%struct.out._Z4rootPvmS_m (i8*, i64, i8*, i64)* @_Z4rootPvmS_m_cloned to i8*), i8* %call, i1 false)
call void @llvm.hpvm.wait(i8* %graphID)
%input = bitcast i8* %call to i8**
%0 = load i8*, i8** %input, align 1, !tbaa !6
tail call void @hpvm_request_tensor(i8* %0, i32 1)
call void @llvm.hpvm.cleanup()
ret i32 0
}
; Function Attrs: nofree nounwind
declare dso_local noalias i8* @malloc(i64) local_unnamed_addr #1
declare dso_local void @hpvm_request_tensor(i8*, i32) local_unnamed_addr #2
; Function Attrs: nounwind
declare i8* @llvm.hpvm.tensor.group.convolution(i8*, i8*, i32, i32, i32, i32, i32, i32) #3
; Function Attrs: uwtable
define dso_local %struct.out._Z14groupConv_nodePvmS_m @_Z14groupConv_nodePvmS_m_cloned(i8* in %t1, i64 %bytes_t1, i8* in %t2, i64 %bytes_t2) #4 {
entry:
%call1 = call i8* @llvm.hpvm.tensor.group.convolution(i8* %t1, i8* %t2, i32 1, i32 1, i32 1, i32 1, i32 1, i32 32)
%returnStruct = insertvalue %struct.out._Z14groupConv_nodePvmS_m undef, i8* %call1, 0
%returnStruct2 = insertvalue %struct.out._Z14groupConv_nodePvmS_m %returnStruct, i64 0, 1
ret %struct.out._Z14groupConv_nodePvmS_m %returnStruct2
}
; Function Attrs: nounwind
declare i8* @llvm.hpvm.tensor.softmax(i8*) #3
; Function Attrs: uwtable
define dso_local %struct.out._Z12softmax_nodePvm @_Z12softmax_nodePvm_cloned(i8* in %t1, i64 %bytes_t1) #4 {
entry:
%call1 = call i8* @llvm.hpvm.tensor.softmax(i8* %t1)
%returnStruct = insertvalue %struct.out._Z12softmax_nodePvm undef, i8* %call1, 0
%returnStruct2 = insertvalue %struct.out._Z12softmax_nodePvm %returnStruct, i64 0, 1
ret %struct.out._Z12softmax_nodePvm %returnStruct2
}
; Function Attrs: nounwind
declare i8* @llvm.hpvm.tensor.pool.max(i8*, i32, i32, i32, i32, i32, i32) #3
; Function Attrs: uwtable
define dso_local %struct.out._Z13pool_max_nodePvm @_Z13pool_max_nodePvm_cloned(i8* in %t1, i64 %bytes_t1) #4 {
entry:
%call1 = call i8* @llvm.hpvm.tensor.pool.max(i8* %t1, i32 2, i32 2, i32 0, i32 0, i32 2, i32 2)
%returnStruct = insertvalue %struct.out._Z13pool_max_nodePvm undef, i8* %call1, 0
%returnStruct2 = insertvalue %struct.out._Z13pool_max_nodePvm %returnStruct, i64 0, 1
ret %struct.out._Z13pool_max_nodePvm %returnStruct2
}
; Function Attrs: nounwind
declare i8* @llvm.hpvm.createNode(i8*) #3
; Function Attrs: nounwind
declare void @llvm.hpvm.bind.input(i8*, i32, i32, i1) #3
; Function Attrs: nounwind
declare i8* @llvm.hpvm.createEdge(i8*, i8*, i1, i32, i32, i1) #3
; Function Attrs: nounwind
declare void @llvm.hpvm.bind.output(i8*, i32, i32, i1) #3
; Function Attrs: uwtable
define dso_local %struct.out._Z4rootPvmS_m @_Z4rootPvmS_m_cloned(i8* in %input, i64 %input_bytes, i8* in %gconv, i64 %gconv_bytes) #4 {
entry:
%_Z14groupConv_nodePvmS_m_cloned.node = call i8* @llvm.hpvm.createNode(i8* bitcast (%struct.out._Z14groupConv_nodePvmS_m (i8*, i64, i8*, i64)* @_Z14groupConv_nodePvmS_m_cloned to i8*))
call void @llvm.hpvm.bind.input(i8* %_Z14groupConv_nodePvmS_m_cloned.node, i32 0, i32 0, i1 false)
call void @llvm.hpvm.bind.input(i8* %_Z14groupConv_nodePvmS_m_cloned.node, i32 1, i32 1, i1 false)
call void @llvm.hpvm.bind.input(i8* %_Z14groupConv_nodePvmS_m_cloned.node, i32 2, i32 2, i1 false)
call void @llvm.hpvm.bind.input(i8* %_Z14groupConv_nodePvmS_m_cloned.node, i32 3, i32 3, i1 false)
%_Z13pool_max_nodePvm_cloned.node = call i8* @llvm.hpvm.createNode(i8* bitcast (%struct.out._Z13pool_max_nodePvm (i8*, i64)* @_Z13pool_max_nodePvm_cloned to i8*))
%output = call i8* @llvm.hpvm.createEdge(i8* %_Z14groupConv_nodePvmS_m_cloned.node, i8* %_Z13pool_max_nodePvm_cloned.node, i1 true, i32 0, i32 0, i1 false)
%output1 = call i8* @llvm.hpvm.createEdge(i8* %_Z14groupConv_nodePvmS_m_cloned.node, i8* %_Z13pool_max_nodePvm_cloned.node, i1 true, i32 1, i32 1, i1 false)
%_Z12softmax_nodePvm_cloned.node = call i8* @llvm.hpvm.createNode(i8* bitcast (%struct.out._Z12softmax_nodePvm (i8*, i64)* @_Z12softmax_nodePvm_cloned to i8*))
%output2 = call i8* @llvm.hpvm.createEdge(i8* %_Z13pool_max_nodePvm_cloned.node, i8* %_Z12softmax_nodePvm_cloned.node, i1 true, i32 0, i32 0, i1 false)
%output3 = call i8* @llvm.hpvm.createEdge(i8* %_Z13pool_max_nodePvm_cloned.node, i8* %_Z12softmax_nodePvm_cloned.node, i1 true, i32 1, i32 1, i1 false)
call void @llvm.hpvm.bind.output(i8* %_Z12softmax_nodePvm_cloned.node, i32 0, i32 0, i1 false)
call void @llvm.hpvm.bind.output(i8* %_Z12softmax_nodePvm_cloned.node, i32 1, i32 1, i1 false)
ret %struct.out._Z4rootPvmS_m undef
}
; Function Attrs: nounwind
declare void @llvm.hpvm.init() #3
; Function Attrs: nounwind
declare i8* @llvm.hpvm.launch(i8*, i8*, i1) #3
; Function Attrs: nounwind
declare void @llvm.hpvm.wait(i8*) #3
; Function Attrs: nounwind
declare void @llvm.hpvm.cleanup() #3
attributes #0 = { norecurse uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
attributes #1 = { nofree nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
attributes #2 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
attributes #3 = { nounwind }
attributes #4 = { uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
!llvm.module.flags = !{!0}
!llvm.ident = !{!1}
!hpvm_hint_promise = !{!2, !3, !4, !5}
!hpvm_hint_gpu = !{}
!hpvm_hint_cpu = !{}
!hpvm_hint_cpu_gpu = !{}
!hpvm_hint_cudnn = !{}
!0 = !{i32 1, !"wchar_size", i32 4}
!1 = !{!"clang version 9.0.0 (https://gitlab.engr.illinois.edu/llvm/hpvm.git 5c2a920901bb51fcc2e51f920c0f726cbd6d3f0d)"}
!2 = !{%struct.out._Z14groupConv_nodePvmS_m (i8*, i64, i8*, i64)* @_Z14groupConv_nodePvmS_m_cloned}
!3 = !{%struct.out._Z12softmax_nodePvm (i8*, i64)* @_Z12softmax_nodePvm_cloned}
!4 = !{%struct.out._Z13pool_max_nodePvm (i8*, i64)* @_Z13pool_max_nodePvm_cloned}
!5 = !{%struct.out._Z4rootPvmS_m (i8*, i64, i8*, i64)* @_Z4rootPvmS_m_cloned}
!6 = !{!7, !8, i64 0}
!7 = !{!"_ZTS6RootIn", !8, i64 0, !11, i64 8, !8, i64 16, !11, i64 24, !12, i64 32}
!8 = !{!"any pointer", !9, i64 0}
!9 = !{!"omnipotent char", !10, i64 0}
!10 = !{!"Simple C++ TBAA"}
!11 = !{!"long", !9, i64 0}
!12 = !{!"_ZTS5ret_t", !8, i64 0, !11, i64 8}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment