diff options
| author | Aaron Watry <awatry@gmail.com> | 2013-05-06 20:28:01 -0500 |
|---|---|---|
| committer | Aaron Watry <awatry@gmail.com> | 2013-05-06 20:28:01 -0500 |
| commit | fbddc8a580e8f772e85cb1c80ca6fbbb05e466d7 (patch) | |
| tree | 54b863a73e7586837eeadf78bde307e094fc7869 | |
| parent | 0e7f8e746530d5bad3634c6ca73f35b221709b01 (diff) | |
| parent | acb59f99cb831dbcf5ab4e2d26584192c8f5655e (diff) | |
Merge branch 'master' of git://people.freedesktop.org/~tstellar/libclc
Conflicts:
generic/include/clc/clc.h
generic/lib/SOURCES
generic/lib/shared/clamp.inc
| -rw-r--r-- | r600/lib/workitem/get_group_id.ll | 12 | ||||
| -rw-r--r-- | r600/lib/workitem/get_local_size.ll | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/r600/lib/workitem/get_group_id.ll b/r600/lib/workitem/get_group_id.ll index 5131648..0dc86e5 100644 --- a/r600/lib/workitem/get_group_id.ll +++ b/r600/lib/workitem/get_group_id.ll @@ -1,17 +1,17 @@ -declare i32 @llvm.r600.read.local.size.x() nounwind readnone -declare i32 @llvm.r600.read.local.size.y() nounwind readnone -declare i32 @llvm.r600.read.local.size.z() nounwind readnone +declare i32 @llvm.r600.read.tgid.x() nounwind readnone +declare i32 @llvm.r600.read.tgid.y() nounwind readnone +declare i32 @llvm.r600.read.tgid.z() nounwind readnone define i32 @get_group_id(i32 %dim) nounwind readnone alwaysinline { switch i32 %dim, label %default [i32 0, label %x_dim i32 1, label %y_dim i32 2, label %z_dim] x_dim: - %x = call i32 @llvm.r600.read.local.size.x() nounwind readnone + %x = call i32 @llvm.r600.read.tgid.x() nounwind readnone ret i32 %x y_dim: - %y = call i32 @llvm.r600.read.local.size.y() nounwind readnone + %y = call i32 @llvm.r600.read.tgid.y() nounwind readnone ret i32 %y z_dim: - %z = call i32 @llvm.r600.read.local.size.z() nounwind readnone + %z = call i32 @llvm.r600.read.tgid.z() nounwind readnone ret i32 %z default: ret i32 0 diff --git a/r600/lib/workitem/get_local_size.ll b/r600/lib/workitem/get_local_size.ll index 6a71f75..0a98de6 100644 --- a/r600/lib/workitem/get_local_size.ll +++ b/r600/lib/workitem/get_local_size.ll @@ -1,17 +1,17 @@ -declare i32 @llvm.r600.read.tgid.x() nounwind readnone -declare i32 @llvm.r600.read.tgid.y() nounwind readnone -declare i32 @llvm.r600.read.tgid.z() nounwind readnone +declare i32 @llvm.r600.read.local.size.x() nounwind readnone +declare i32 @llvm.r600.read.local.size.y() nounwind readnone +declare i32 @llvm.r600.read.local.size.z() nounwind readnone define i32 @get_local_size(i32 %dim) nounwind readnone alwaysinline { switch i32 %dim, label %default [i32 0, label %x_dim i32 1, label %y_dim i32 2, label %z_dim] x_dim: - %x = call i32 @llvm.r600.read.tgid.x() nounwind readnone + %x = call i32 @llvm.r600.read.local.size.x() nounwind readnone ret i32 %x y_dim: - %y = call i32 @llvm.r600.read.tgid.y() nounwind readnone + %y = call i32 @llvm.r600.read.local.size.y() nounwind readnone ret i32 %y z_dim: - %z = call i32 @llvm.r600.read.tgid.z() nounwind readnone + %z = call i32 @llvm.r600.read.local.size.z() nounwind readnone ret i32 %z default: ret i32 0 |