diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_cinn_prim.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_cinn_prim.py
index a807e1eef234048fd0860ea616a7f6aaf241da7e..b5af3a19d49afc4cf1cd262911058b46799fd3cc 100644
--- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_cinn_prim.py
+++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_cinn_prim.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import platform
 import unittest
 
 import numpy as np
@@ -134,17 +133,13 @@ class TestPrimForwardAndBackward(unittest.TestCase):
         self.assertTrue('softmax' not in fwd_ops)
 
     def test_cinn_prim(self):
-        plat = platform.system()
-        if plat == "Linux":
-            dy_res = self.train(use_prim=False)
-            cinn_res = self.train(use_prim=True)
-
-            for i in range(len(dy_res)):
-                np.testing.assert_allclose(
-                    cinn_res[i], dy_res[i], rtol=1e-6, atol=1e-6
-                )
-        else:
-            pass
+        dy_res = self.train(use_prim=False)
+        cinn_res = self.train(use_prim=True)
+
+        for i in range(len(dy_res)):
+            np.testing.assert_allclose(
+                cinn_res[i], dy_res[i], rtol=1e-6, atol=1e-6
+            )
 
 
 if __name__ == '__main__':
diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_cinn_prim_gelu.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_cinn_prim_gelu.py
index bd8587b906778f3b876f518e65233793f2368b2b..2fce19b3943f1ad54e77bbb71881738d87653e71 100644
--- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_cinn_prim_gelu.py
+++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_cinn_prim_gelu.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import platform
 import unittest
 
 import numpy as np
@@ -98,31 +97,23 @@ class TestPrimForwardAndBackward(unittest.TestCase):
         self.assertTrue('gelu' not in fwd_ops)
 
     def test_cinn_prim(self):
-        plat = platform.system()
-        if plat == "Linux":
-            for shape in self.shapes:
-                for dtype in self.dtypes:
-                    if (
-                        paddle.device.get_device() == "cpu"
-                        and dtype == "float16"
-                    ):
-                        print("need pass this case")
-                        continue
-                    data = generate_data(shape, dtype)
-                    data_t = paddle.to_tensor(data)
-                    data_t.stop_gradient = False
-                    dy_res = self.train(use_prim=False, data=data_t)
-                    cinn_res = self.train(use_prim=True, data=data_t)
-                    for i in range(len(dy_res)):
-                        np.testing.assert_allclose(
-                            cinn_res[i],
-                            dy_res[i],
-                            rtol=TOLERANCE[dtype]['rtol'],
-                            atol=TOLERANCE[dtype]['atol'],
-                        )
-
-        else:
-            pass
+        for shape in self.shapes:
+            for dtype in self.dtypes:
+                if paddle.device.get_device() == "cpu" and dtype == "float16":
+                    print("need pass this case")
+                    continue
+                data = generate_data(shape, dtype)
+                data_t = paddle.to_tensor(data)
+                data_t.stop_gradient = False
+                dy_res = self.train(use_prim=False, data=data_t)
+                cinn_res = self.train(use_prim=True, data=data_t)
+                for i in range(len(dy_res)):
+                    np.testing.assert_allclose(
+                        cinn_res[i],
+                        dy_res[i],
+                        rtol=TOLERANCE[dtype]['rtol'],
+                        atol=TOLERANCE[dtype]['atol'],
+                    )
 
 
 if __name__ == '__main__':
diff --git a/python/paddle/fluid/tests/unittests/prim/composite_ops/CMakeLists.txt b/python/paddle/fluid/tests/unittests/prim/composite_ops/CMakeLists.txt
index 7ff2714bdfd73f52879db92cc19b9ca3865ebc10..35ae4537dd8f6335bda0a37c61cbd738485ab8f3 100644
--- a/python/paddle/fluid/tests/unittests/prim/composite_ops/CMakeLists.txt
+++ b/python/paddle/fluid/tests/unittests/prim/composite_ops/CMakeLists.txt
@@ -10,11 +10,6 @@ file(
 string(REPLACE ".py" "" TEST_OPS "${TEST_OPS}")
 string(REPLACE ".py" "" TEST_OPS_GRAD "${TEST_OPS_GRAD}")
 
-if(WIN32 OR APPLE)
-  # TODO: Fix these unittests failed on Windows and MAC.
-  list(REMOVE_ITEM TEST_OPS ${TEST_OPS_GRAD})
-endif()
-
 foreach(TEST_OP ${TEST_OPS})
   py_test_modules(${TEST_OP} MODULES ${TEST_OP} ENVS ${GC_ENVS})
 endforeach()
diff --git a/python/paddle/incubate/autograd/composite_rules.py b/python/paddle/incubate/autograd/composite_rules.py
index 6aaed8d2ef9df6d87a27bb953e6a7db685f2d7c6..70bb8f8b80492e43991f3c0593be3abce300f217 100644
--- a/python/paddle/incubate/autograd/composite_rules.py
+++ b/python/paddle/incubate/autograd/composite_rules.py
@@ -34,7 +34,7 @@ def softmax_composite(x, axis):
     """define composite rule of op softmax"""
     if not x.shape:
         # do not return 1, to ensure gradients
-        res = divide(x + 1e-5, x + 1e-5)
+        res = exp(x - x)
         return res
     max_temp = max(x, axis, keepdim=True)
     max_temp.stop_gradient = True
diff --git a/tools/check_file_diff_approvals.sh b/tools/check_file_diff_approvals.sh
index 09a6449720340efb9aa61000a2dd1282deba9aeb..a065d7db9eb395c622f1746554670321614dd7ff 100644
--- a/tools/check_file_diff_approvals.sh
+++ b/tools/check_file_diff_approvals.sh
@@ -83,6 +83,7 @@ API_FILES=("CMakeLists.txt"
            "paddle/fluid/prim/api/composite_backward/composite_backward_api.h"
            "paddle/fluid/prim/api/manual_prim/prim_manual_api.h"
            "python/paddle/incubate/autograd/composite_rules.py"
+	   "python/paddle/incubate/autograd/primitives.py"
            )
 
 approval_line=`curl -H "Authorization: token ${GITHUB_API_TOKEN}" https://api.github.com/repos/PaddlePaddle/Paddle/pulls/${GIT_PR_ID}/reviews?per_page=10000`
@@ -210,7 +211,7 @@ for API_FILE in ${API_FILES[*]}; do
             check_approval 1 JiabinYang cxxly xiaoguoguo626807
       elif [ "${API_FILE}" == "python/paddle/incubate/autograd/primitives.py" ] || [ "${API_FILE}" == "python/paddle/incubate/autograd/composite_rules.py" ]; then
             echo_line="You must have one RD (cyber-pioneer(chenzhuo), JiabinYang) approval for changing ${API_FILE} , which manages the composite rules.\n"
-            check_approval cyber-pioneer JiabinYang
+            check_approval 1 cyber-pioneer JiabinYang
 
       else
           echo_line="You must have one RD (XiaoguangHu01,chenwhql,zhiqiu,Xreki,luotao1,qili93) approval for ${API_FILE}, which manages the underlying code for fluid.\n"