diff --git a/libclc/generic/include/clc/atomic/atomic_xor.h b/libclc/generic/include/clc/atomic/atomic_xor.h
new file mode 100644
index 000000000000..59aa3674a511
--- /dev/null
+++ b/libclc/generic/include/clc/atomic/atomic_xor.h
@@ -0,0 +1,3 @@
+#define __CLC_FUNCTION atomic_xor
+#include <clc/atomic/atomic_decl.inc>
+#undef __CLC_FUNCTION
diff --git a/libclc/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_xor.h b/libclc/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_xor.h
new file mode 100644
index 000000000000..f787849cff00
--- /dev/null
+++ b/libclc/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_xor.h
@@ -0,0 +1,2 @@
+_CLC_OVERLOAD _CLC_DECL int atom_xor(global int *p, int val);
+_CLC_OVERLOAD _CLC_DECL unsigned int atom_xor(global unsigned int *p, unsigned int val);
diff --git a/libclc/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_xor.h b/libclc/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_xor.h
new file mode 100644
index 000000000000..e6c9f2f57521
--- /dev/null
+++ b/libclc/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_xor.h
@@ -0,0 +1,2 @@
+_CLC_OVERLOAD _CLC_DECL int atom_xor(local int *p, int val);
+_CLC_OVERLOAD _CLC_DECL unsigned int atom_xor(local unsigned int *p, unsigned int val);
diff --git a/libclc/generic/include/clc/clc.h b/libclc/generic/include/clc/clc.h
index 4e3346263d9e..a001b80f53c3 100644
--- a/libclc/generic/include/clc/clc.h
+++ b/libclc/generic/include/clc/clc.h
@@ -147,6 +147,7 @@
 #include <clc/atomic/atomic_max.h>
 #include <clc/atomic/atomic_or.h>
 #include <clc/atomic/atomic_sub.h>
+#include <clc/atomic/atomic_xor.h>
 
 /* cl_khr_global_int32_base_atomics Extension Functions */
 #include <clc/cl_khr_global_int32_base_atomics/atom_add.h>
@@ -158,6 +159,7 @@
 #include <clc/cl_khr_global_int32_extended_atomics/atom_and.h>
 #include <clc/cl_khr_global_int32_extended_atomics/atom_max.h>
 #include <clc/cl_khr_global_int32_extended_atomics/atom_or.h>
+#include <clc/cl_khr_global_int32_extended_atomics/atom_xor.h>
 
 /* cl_khr_local_int32_base_atomics Extension Functions */
 #include <clc/cl_khr_local_int32_base_atomics/atom_add.h>
@@ -169,6 +171,7 @@
 #include <clc/cl_khr_local_int32_extended_atomics/atom_and.h>
 #include <clc/cl_khr_local_int32_extended_atomics/atom_max.h>
 #include <clc/cl_khr_local_int32_extended_atomics/atom_or.h>
+#include <clc/cl_khr_local_int32_extended_atomics/atom_xor.h>
 
 /* libclc internal defintions */
 #ifdef __CLC_INTERNAL
diff --git a/libclc/generic/lib/SOURCES b/libclc/generic/lib/SOURCES
index b083a7dec46e..9bb3bfa0838e 100644
--- a/libclc/generic/lib/SOURCES
+++ b/libclc/generic/lib/SOURCES
@@ -7,6 +7,7 @@ cl_khr_global_int32_base_atomics/atom_sub.cl
 cl_khr_global_int32_extended_atomics/atom_and.cl
 cl_khr_global_int32_extended_atomics/atom_max.cl
 cl_khr_global_int32_extended_atomics/atom_or.cl
+cl_khr_global_int32_extended_atomics/atom_xor.cl
 cl_khr_local_int32_base_atomics/atom_add.cl
 cl_khr_local_int32_base_atomics/atom_dec.cl
 cl_khr_local_int32_base_atomics/atom_inc.cl
@@ -14,6 +15,7 @@ cl_khr_local_int32_base_atomics/atom_sub.cl
 cl_khr_local_int32_extended_atomics/atom_and.cl
 cl_khr_local_int32_extended_atomics/atom_max.cl
 cl_khr_local_int32_extended_atomics/atom_or.cl
+cl_khr_local_int32_extended_atomics/atom_xor.cl
 convert.cl
 common/sign.cl
 geometric/cross.cl
diff --git a/libclc/generic/lib/atomic/atomic_impl.ll b/libclc/generic/lib/atomic/atomic_impl.ll
index 1e932ccd6dea..a62399d2b6f9 100644
--- a/libclc/generic/lib/atomic/atomic_impl.ll
+++ b/libclc/generic/lib/atomic/atomic_impl.ll
@@ -45,6 +45,7 @@ entry:
   %0 = atomicrmw volatile or i32 addrspace(3)* %ptr, i32 %value seq_cst
   ret i32 %0
 }
+
 define i32 @__clc_atomic_umax_addr1(i32 addrspace(1)* nocapture %ptr, i32 %value) nounwind alwaysinline {
 entry:
   %0 = atomicrmw volatile umax i32 addrspace(1)* %ptr, i32 %value seq_cst
@@ -68,3 +69,15 @@ entry:
   %0 = atomicrmw volatile sub i32 addrspace(3)* %ptr, i32 %value seq_cst
   ret i32 %0
 }
+
+define i32 @__clc_atomic_xor_addr1(i32 addrspace(1)* nocapture %ptr, i32 %value) nounwind alwaysinline {
+entry:
+  %0 = atomicrmw volatile xor i32 addrspace(1)* %ptr, i32 %value seq_cst
+  ret i32 %0
+}
+
+define i32 @__clc_atomic_xor_addr3(i32 addrspace(3)* nocapture %ptr, i32 %value) nounwind alwaysinline {
+entry:
+  %0 = atomicrmw volatile xor i32 addrspace(3)* %ptr, i32 %value seq_cst
+  ret i32 %0
+}
diff --git a/libclc/generic/lib/cl_khr_global_int32_extended_atomics/atom_xor.cl b/libclc/generic/lib/cl_khr_global_int32_extended_atomics/atom_xor.cl
new file mode 100644
index 000000000000..1a8e35004cd5
--- /dev/null
+++ b/libclc/generic/lib/cl_khr_global_int32_extended_atomics/atom_xor.cl
@@ -0,0 +1,9 @@
+#include <clc/clc.h>
+
+#define IMPL(TYPE) \
+_CLC_OVERLOAD _CLC_DEF TYPE atom_xor(global TYPE *p, TYPE val) { \
+  return atomic_xor(p, val); \
+}
+
+IMPL(int)
+IMPL(unsigned int)
diff --git a/libclc/generic/lib/cl_khr_local_int32_extended_atomics/atom_xor.cl b/libclc/generic/lib/cl_khr_local_int32_extended_atomics/atom_xor.cl
new file mode 100644
index 000000000000..51ae3c0e9194
--- /dev/null
+++ b/libclc/generic/lib/cl_khr_local_int32_extended_atomics/atom_xor.cl
@@ -0,0 +1,9 @@
+#include <clc/clc.h>
+
+#define IMPL(TYPE) \
+_CLC_OVERLOAD _CLC_DEF TYPE atom_xor(local TYPE *p, TYPE val) { \
+  return atomic_xor(p, val); \
+}
+
+IMPL(int)
+IMPL(unsigned int)