Merge pull request #4850 from martin-frbg/generic_3m

Make the dummy GEMM3M kernel for GENERIC targets forward to regular GEMM for now

kernel/Makefile.L3

@@ -17,15 +17,6 @@ ifeq ($(ARCH), ia64)
 USE_GEMM3M = 1
 endif
 
-ifneq ($(DYNAMIC_ARCH), 1)
-ifeq ($(TARGET), GENERIC)
-USE_GEMM3M = 0
-endif
-else
-ifeq ($(CORE), GENERIC)
-USE_GEMM3M = 0
-endif
-endif
 
 ifeq ($(ARCH), arm)
 USE_TRMM = 1

kernel/generic/zgemm3mkernel_dump.c

@@ -25,10 +25,16 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/
+#if 1
 
+#include "zgemmkernel_2x2.c"
+
+
+#else
 #include "common.h"
 
 int CNAME(BLASLONG bm, BLASLONG bn, BLASLONG bk, FLOAT alphar, FLOAT alphai, FLOAT * ba, FLOAT * bb, FLOAT * C, BLASLONG ldc)
 {
   return 0;
 }
+#endif